Merge branch 'next' into ipv6
Showing
- .circleci/config.yml 21 additions, 9 deletions.circleci/config.yml
- .gitignore 2 additions, 0 deletions.gitignore
- CMakeLists.txt 103 additions, 98 deletionsCMakeLists.txt
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- assets/CMakeLists.txt 33 additions, 54 deletionsassets/CMakeLists.txt
- assets/README.txt 24 additions, 25 deletionsassets/README.txt
- cmake/CPM.cmake 21 additions, 0 deletionscmake/CPM.cmake
- cmake/Modules/FindGME.cmake 11 additions, 1 deletioncmake/Modules/FindGME.cmake
- cmake/Modules/FindOPENMPT.cmake 11 additions, 1 deletioncmake/Modules/FindOPENMPT.cmake
- cmake/Modules/FindSDL2.cmake 10 additions, 0 deletionscmake/Modules/FindSDL2.cmake
- cmake/Modules/FindSDL2_mixer.cmake 10 additions, 0 deletionscmake/Modules/FindSDL2_mixer.cmake
- cmake/launch-c.in 0 additions, 3 deletionscmake/launch-c.in
- cmake/launch-cxx.in 0 additions, 3 deletionscmake/launch-cxx.in
- comptime.sh 22 additions, 32 deletionscomptime.sh
- debian-template/rules 1 addition, 1 deletiondebian-template/rules
- extras/conf/SRB2-22.cfg 624 additions, 141 deletionsextras/conf/SRB2-22.cfg
- extras/conf/udb/Includes/SRB222_common.cfg 15 additions, 13 deletionsextras/conf/udb/Includes/SRB222_common.cfg
- extras/conf/udb/Includes/SRB222_linedefs.cfg 4014 additions, 133 deletionsextras/conf/udb/Includes/SRB222_linedefs.cfg
- extras/conf/udb/Includes/SRB222_misc.cfg 214 additions, 7 deletionsextras/conf/udb/Includes/SRB222_misc.cfg
- extras/conf/udb/Includes/SRB222_sectors.cfg 13 additions, 15 deletionsextras/conf/udb/Includes/SRB222_sectors.cfg
Loading
Please register or sign in to comment