-
- Downloads
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- extras/conf/SRB2-22.cfg 80 additions, 13 deletionsextras/conf/SRB2-22.cfg
- extras/conf/udb/Includes/SRB222_linedefs.cfg 70 additions, 0 deletionsextras/conf/udb/Includes/SRB222_linedefs.cfg
- extras/conf/udb/Includes/SRB222_misc.cfg 5 additions, 0 deletionsextras/conf/udb/Includes/SRB222_misc.cfg
- src/CMakeLists.txt 2 additions, 1 deletionsrc/CMakeLists.txt
- src/Makefile 2 additions, 4 deletionssrc/Makefile
- src/am_map.c 2 additions, 5 deletionssrc/am_map.c
- src/b_bot.c 0 additions, 2 deletionssrc/b_bot.c
- src/blua/lbaselib.c 26 additions, 0 deletionssrc/blua/lbaselib.c
- src/blua/liolib.c 15 additions, 10 deletionssrc/blua/liolib.c
- src/command.c 1 addition, 1 deletionsrc/command.c
- src/config.h.in 5 additions, 2 deletionssrc/config.h.in
- src/console.c 1 addition, 4 deletionssrc/console.c
- src/d_clisrv.c 668 additions, 127 deletionssrc/d_clisrv.c
- src/d_clisrv.h 33 additions, 9 deletionssrc/d_clisrv.h
- src/d_main.c 101 additions, 5 deletionssrc/d_main.c
- src/d_net.c 7 additions, 3 deletionssrc/d_net.c
- src/d_netcmd.c 84 additions, 52 deletionssrc/d_netcmd.c
- src/d_netfil.c 485 additions, 142 deletionssrc/d_netfil.c
Loading
Please register or sign in to comment