Merge branch 'master' of git://github.com/STJr/SRB2 into switch-port
No related branches found
No related tags found
Showing
- .travis.yml 37 additions, 17 deletions.travis.yml
- CMakeLists.txt 1 addition, 2 deletionsCMakeLists.txt
- appveyor.yml 141 additions, 145 deletionsappveyor.yml
- assets/CMakeLists.txt 8 additions, 2 deletionsassets/CMakeLists.txt
- debian-template/control 2 additions, 0 deletionsdebian-template/control
- deployer/travis/deployer_defaults.sh 8 additions, 8 deletionsdeployer/travis/deployer_defaults.sh
- extras/conf/Includes/Game_SRB222.cfg 77 additions, 0 deletionsextras/conf/Includes/Game_SRB222.cfg
- extras/conf/Includes/SRB222_common.cfg 309 additions, 0 deletionsextras/conf/Includes/SRB222_common.cfg
- extras/conf/Includes/SRB222_linedefs.cfg 2486 additions, 0 deletionsextras/conf/Includes/SRB222_linedefs.cfg
- extras/conf/Includes/SRB222_misc.cfg 726 additions, 0 deletionsextras/conf/Includes/SRB222_misc.cfg
- extras/conf/Includes/SRB222_sectors.cfg 109 additions, 0 deletionsextras/conf/Includes/SRB222_sectors.cfg
- extras/conf/Includes/SRB222_things.cfg 3398 additions, 0 deletionsextras/conf/Includes/SRB222_things.cfg
- extras/conf/SRB2-22.cfg 5 additions, 5 deletionsextras/conf/SRB2-22.cfg
- extras/conf/SRB2_22Doom.cfg 38 additions, 0 deletionsextras/conf/SRB2_22Doom.cfg
- extras/conf/SRB2_22UDMF.cfg 47 additions, 0 deletionsextras/conf/SRB2_22UDMF.cfg
- src/CMakeLists.txt 1 addition, 5 deletionssrc/CMakeLists.txt
- src/Makefile 1 addition, 1 deletionsrc/Makefile
- src/am_map.c 99 additions, 25 deletionssrc/am_map.c
- src/am_map.h 4 additions, 1 deletionsrc/am_map.h
- src/android/i_system.c 2 additions, 0 deletionssrc/android/i_system.c
Loading
Please register or sign in to comment