Merge branch 'master' into the-scary-22-merge
Showing
- .travis.yml 1 addition, 1 deletion.travis.yml
- src/CMakeLists.txt 10 additions, 2 deletionssrc/CMakeLists.txt
- src/Makefile 15 additions, 11 deletionssrc/Makefile
- src/Makefile.cfg 3 additions, 0 deletionssrc/Makefile.cfg
- src/console.c 2 additions, 0 deletionssrc/console.c
- src/d_clisrv.c 75 additions, 34 deletionssrc/d_clisrv.c
- src/d_clisrv.h 20 additions, 9 deletionssrc/d_clisrv.h
- src/d_main.c 80 additions, 38 deletionssrc/d_main.c
- src/d_net.h 3 additions, 1 deletionsrc/d_net.h
- src/d_netcmd.c 393 additions, 53 deletionssrc/d_netcmd.c
- src/d_netcmd.h 6 additions, 1 deletionsrc/d_netcmd.h
- src/d_netfil.c 1 addition, 1 deletionsrc/d_netfil.c
- src/d_player.h 42 additions, 24 deletionssrc/d_player.h
- src/d_ticcmd.h 2 additions, 1 deletionsrc/d_ticcmd.h
- src/dehacked.c 543 additions, 14 deletionssrc/dehacked.c
- src/doomstat.h 28 additions, 0 deletionssrc/doomstat.h
- src/f_wipe.c 9 additions, 0 deletionssrc/f_wipe.c
- src/font.c 77 additions, 0 deletionssrc/font.c
- src/font.h 49 additions, 0 deletionssrc/font.h
- src/g_game.c 221 additions, 189 deletionssrc/g_game.c
Loading
Please register or sign in to comment