Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

b75a09bf

Commit b75a09bf authored 1 year ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch SRB2:next into expos-special

parents 2647b108 a68440c4

No related branches found

No related tags found

Loading

Changes 232

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 22 additions, 19 deletions

.circleci/config.yml
.gitattributes 3 additions, 1 deletion

.gitattributes
.gitignore 2 additions, 1 deletion

.gitignore
.gitlab-ci.yml 434 additions, 0 deletions

.gitlab-ci.yml
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 1 addition, 9 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
cpdebug.mk 4 additions, 4 deletions

cpdebug.mk
extras/conf/SRB2-22.cfg 15 additions, 5 deletions

extras/conf/SRB2-22.cfg

with 694 additions and 246 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