Merge branch 'next' into udmf-plane-linedefs
# Conflicts: # src/p_inter.c
No related branches found
No related tags found
Showing
- appveyor.yml 5 additions, 22 deletionsappveyor.yml
- extras/conf/SRB2-22.cfg 16 additions, 0 deletionsextras/conf/SRB2-22.cfg
- src/CMakeLists.txt 2 additions, 2 deletionssrc/CMakeLists.txt
- src/Makefile 39 additions, 31 deletionssrc/Makefile
- src/Makefile.d/detect.mk 9 additions, 6 deletionssrc/Makefile.d/detect.mk
- src/Makefile.d/old.mk 16 additions, 0 deletionssrc/Makefile.d/old.mk
- src/Makefile.d/platform.mk 2 additions, 0 deletionssrc/Makefile.d/platform.mk
- src/Makefile.d/util.mk 2 additions, 1 deletionsrc/Makefile.d/util.mk
- src/am_map.c 3 additions, 3 deletionssrc/am_map.c
- src/b_bot.c 132 additions, 106 deletionssrc/b_bot.c
- src/b_bot.h 1 addition, 0 deletionssrc/b_bot.h
- src/blua/lbaselib.c 1 addition, 1 deletionsrc/blua/lbaselib.c
- src/command.c 8 additions, 3 deletionssrc/command.c
- src/console.c 7 additions, 7 deletionssrc/console.c
- src/d_clisrv.c 202 additions, 70 deletionssrc/d_clisrv.c
- src/d_clisrv.h 17 additions, 12 deletionssrc/d_clisrv.h
- src/d_event.h 4 additions, 3 deletionssrc/d_event.h
- src/d_main.c 41 additions, 21 deletionssrc/d_main.c
- src/d_netcmd.c 250 additions, 8 deletionssrc/d_netcmd.c
- src/d_netcmd.h 7 additions, 7 deletionssrc/d_netcmd.h
Loading
Please register or sign in to comment