Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2-archivedmodifications
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

b9b6dc0f

Commit b9b6dc0f authored 1 year ago by Skydusk

Downloads
- Plain Diff

Merge branch SRB2:next into next

parents d8e96221 6c416c61

No related branches found

No related tags found

No related merge requests found

Changes 178

Show whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 1 addition, 1 deletion

.circleci/config.yml
.gitignore 1 addition, 1 deletion

.gitignore
CMakeLists.txt 62 additions, 15 deletions

CMakeLists.txt
CMakePresets.json 29 additions, 0 deletions

CMakePresets.json
README.md 0 additions, 1 deletion

README.md
SRB2.cbp 0 additions, 18 deletions

SRB2.cbp
SRB2_common.props 0 additions, 3 deletions

SRB2_common.props
Srb2.dev 1 addition, 51 deletions

Srb2.dev
alias-bootstrap.sh 29 additions, 0 deletions

alias-bootstrap.sh
appveyor.yml 0 additions, 8 deletions

appveyor.yml
cmake/Comptime.cmake 32 additions, 0 deletions

cmake/Comptime.cmake
cmake/Modules/CMakeASM_YASMInformation.cmake 0 additions, 46 deletions

cmake/Modules/CMakeASM_YASMInformation.cmake
cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake 0 additions, 27 deletions

cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake
cmake/Modules/CMakeTestASM_YASMCompiler.cmake 0 additions, 23 deletions

cmake/Modules/CMakeTestASM_YASMCompiler.cmake
cmake/Modules/GitUtilities.cmake 39 additions, 23 deletions

cmake/Modules/GitUtilities.cmake
cmake/Modules/clang-tidy-default.cmake 21 additions, 0 deletions

cmake/Modules/clang-tidy-default.cmake
extras/conf/SRB2-22.cfg 15 additions, 5 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_linedefs.cfg 0 additions, 46 deletions

extras/conf/udb/Includes/SRB222_linedefs.cfg
extras/conf/udb/Includes/SRB222_things.cfg 16 additions, 5 deletions

extras/conf/udb/Includes/SRB222_things.cfg
src/Android.mk 1 addition, 1 deletion

src/Android.mk

with 247 additions and 274 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment