Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays (7fc1f02b) · Commits · X.organic / 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

7fc1f02b

Commit 7fc1f02b authored 6 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays

# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c

parents b9abd8b9 e50eb1f5

No related branches found

No related tags found

Loading

Changes 71

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 7 additions, 2 deletions

.travis.yml
CMakeLists.txt 3 additions, 2 deletions

CMakeLists.txt
appveyor.yml 2 additions, 2 deletions

appveyor.yml
src/Makefile.cfg 4 additions, 0 deletions

src/Makefile.cfg
src/command.c 2 additions, 1 deletion

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

src/command.h
src/config.h.in 2 additions, 2 deletions

src/config.h.in
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 89 additions, 24 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 150 additions, 8 deletions

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

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

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

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

src/djgppdos/i_video.c
src/doomdef.h 84 additions, 10 deletions

src/doomdef.h

with 946 additions and 206 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