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

e24a9c2f

Commit e24a9c2f authored 1 year ago by Logan Aerl Arias

Downloads
- Plain Diff

Merge branch 'next' into improve-download-refuse-message

parents 2a2fd756 106a98ce

Branches

Tags

2 merge requests!2355fix newer versions of mixerx,!2153Improve addon download refusal messages

Pipeline #1747 passed 1 year ago

Stage: build

Changes 131
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitattributes 1 addition, 0 deletions

.gitattributes
.gitlab-ci.yml 228 additions, 2 deletions

.gitlab-ci.yml
CMakeLists.txt 1 addition, 0 deletions

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
comptime.bat 5 additions, 2 deletions

comptime.bat
comptime.sh 5 additions, 3 deletions

comptime.sh
src/CMakeLists.txt 9 additions, 1 deletion

src/CMakeLists.txt
src/Makefile 2 additions, 1 deletion

src/Makefile
src/Makefile.d/features.mk 1 addition, 1 deletion

src/Makefile.d/features.mk
src/Makefile.d/versions.mk 1 addition, 1 deletion

src/Makefile.d/versions.mk
src/Sourcefile 1 addition, 0 deletions

src/Sourcefile
src/b_bot.c 8 additions, 4 deletions

src/b_bot.c
src/blua/lbaselib.c 21 additions, 2 deletions

src/blua/lbaselib.c
src/command.c 76 additions, 26 deletions

src/command.c
src/console.c 54 additions, 46 deletions

src/console.c
src/d_event.h 1 addition, 0 deletions

src/d_event.h
src/d_main.c 6 additions, 5 deletions

src/d_main.c
src/d_player.h 5 additions, 0 deletions

src/d_player.h
src/d_think.h 1 addition, 0 deletions

src/d_think.h
src/d_ticcmd.h 15 additions, 12 deletions

src/d_ticcmd.h

with 442 additions and 107 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