Merge remote-tracking branch 'remotes/upstream/next' into HEAD (c30c3f7a) · Commits · brokenspleentec / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

c30c3f7a

Commit c30c3f7a authored 6 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/upstream/next' into HEAD

parents fcf072cb 24b5079f

No related branches found

No related tags found

No related merge requests found

Changes 57

Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 2 additions, 1 deletion

src/command.c
src/command.h 2 additions, 1 deletion

src/command.h
src/console.c 16 additions, 10 deletions

src/console.c
src/console.h 2 additions, 0 deletions

src/console.h
src/d_clisrv.c 353 additions, 29 deletions

src/d_clisrv.c
src/d_clisrv.h 29 additions, 6 deletions

src/d_clisrv.h
src/d_main.c 5 additions, 0 deletions

src/d_main.c
src/d_net.c 10 additions, 5 deletions

src/d_net.c
src/d_net.h 1 addition, 1 deletion

src/d_net.h
src/d_netcmd.c 148 additions, 8 deletions

src/d_netcmd.c
src/d_netcmd.h 11 additions, 1 deletion

src/d_netcmd.h
src/d_player.h 4 additions, 7 deletions

src/d_player.h
src/dehacked.c 170 additions, 95 deletions

src/dehacked.c
src/djgppdos/i_video.c 3 additions, 0 deletions

src/djgppdos/i_video.c
src/doomdef.h 80 additions, 6 deletions

src/doomdef.h
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/g_game.c 23 additions, 17 deletions

src/g_game.c
src/hardware/hw_bsp.c 1 addition, 1 deletion

src/hardware/hw_bsp.c
src/hardware/hw_dll.h 0 additions, 3 deletions

src/hardware/hw_dll.h
src/hardware/r_opengl/r_opengl.c 1 addition, 1 deletion

src/hardware/r_opengl/r_opengl.c

with 862 additions and 193 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment