Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

a7807f07

Commit a7807f07 authored 1 year ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into deprecate-lua-dedicated-server

parents 1f4c0cb3 ae783f01

No related branches found

No related tags found

No related merge requests found

Changes 966

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 36 additions, 21 deletions

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

.gitattributes
.gitignore 5 additions, 2 deletions

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

.gitlab-ci.yml
CMakeLists.txt 158 additions, 107 deletions

CMakeLists.txt
CMakePresets.json 29 additions, 0 deletions

CMakePresets.json
Makefile 8 additions, 0 deletions

Makefile
README.md 1 addition, 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 6 additions, 36 deletions

appveyor.yml
assets/CMakeLists.txt 33 additions, 54 deletions

assets/CMakeLists.txt
assets/README.txt 24 additions, 25 deletions

assets/README.txt
bin/FreeBSD/Debug/.gitignore 0 additions, 2 deletions

bin/FreeBSD/Debug/.gitignore
bin/FreeBSD/Release/.gitignore 0 additions, 2 deletions

bin/FreeBSD/Release/.gitignore
bin/Linux/Debug/.gitignore 0 additions, 1 deletion

bin/Linux/Debug/.gitignore
bin/Linux/Release/.gitignore 0 additions, 3 deletions

bin/Linux/Release/.gitignore
bin/Linux64/Debug/.gitignore 0 additions, 1 deletion

bin/Linux64/Debug/.gitignore

with 767 additions and 328 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