Merge branch 'udmf-colormaps' into udmf-fofs-mkii
Showing
- .circleci/config.yml 2 additions, 2 deletions.circleci/config.yml
- extras/conf/Includes/Game_SRB222.cfg 1 addition, 1 deletionextras/conf/Includes/Game_SRB222.cfg
- extras/conf/Includes/SRB222_common.cfg 44 additions, 56 deletionsextras/conf/Includes/SRB222_common.cfg
- extras/conf/Includes/SRB222_linedefs.cfg 214 additions, 984 deletionsextras/conf/Includes/SRB222_linedefs.cfg
- extras/conf/Includes/SRB222_misc.cfg 31 additions, 137 deletionsextras/conf/Includes/SRB222_misc.cfg
- extras/conf/Includes/SRB222_sectors.cfg 2 additions, 2 deletionsextras/conf/Includes/SRB222_sectors.cfg
- extras/conf/Includes/SRB222_things.cfg 0 additions, 258 deletionsextras/conf/Includes/SRB222_things.cfg
- extras/conf/SRB2-22.cfg 80 additions, 40 deletionsextras/conf/SRB2-22.cfg
- extras/conf/SRB2_22Doom.cfg 2 additions, 2 deletionsextras/conf/SRB2_22Doom.cfg
- extras/conf/SRB2_22UDMF.cfg 3 additions, 3 deletionsextras/conf/SRB2_22UDMF.cfg
- src/CMakeLists.txt 83 additions, 86 deletionssrc/CMakeLists.txt
- src/Makefile 2 additions, 5 deletionssrc/Makefile
- src/am_map.c 1 addition, 32 deletionssrc/am_map.c
- src/b_bot.c 0 additions, 4 deletionssrc/b_bot.c
- src/blua/Makefile.cfg 0 additions, 2 deletionssrc/blua/Makefile.cfg
- src/command.c 0 additions, 6 deletionssrc/command.c
- src/d_clisrv.c 63 additions, 71 deletionssrc/d_clisrv.c
- src/d_clisrv.h 3 additions, 4 deletionssrc/d_clisrv.h
- src/d_main.c 0 additions, 8 deletionssrc/d_main.c
- src/d_net.c 0 additions, 4 deletionssrc/d_net.c
Loading
Please register or sign in to comment