Merge branch 'next' into udmf-fofs-mkii (adce4272) · Commits · STJr / SRB2 · GitLab

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

adce4272

Commit adce4272 authored 3 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into udmf-fofs-mkii

# Conflicts:
#	src/p_user.c

parents 6dc49042 bb514a06

No related branches found

No related tags found

Loading

Changes 101

Expand all Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 5 additions, 22 deletions

appveyor.yml
debian-template/rules 1 addition, 1 deletion

debian-template/rules
extras/conf/SRB2-22.cfg 20 additions, 3 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 2 additions, 2 deletions

src/CMakeLists.txt
src/Makefile 4 additions, 2 deletions

src/Makefile
src/Makefile.d/detect.mk 8 additions, 8 deletions

src/Makefile.d/detect.mk
src/Makefile.d/old.mk 1 addition, 1 deletion

src/Makefile.d/old.mk
src/Makefile.d/versions.mk 0 additions, 2 deletions

src/Makefile.d/versions.mk
src/Makefile.d/win32.mk 5 additions, 0 deletions

src/Makefile.d/win32.mk
src/am_map.c 3 additions, 3 deletions

src/am_map.c
src/b_bot.c 132 additions, 106 deletions

src/b_bot.c
src/b_bot.h 1 addition, 0 deletions

src/b_bot.h
src/blua/lbaselib.c 1 addition, 1 deletion

src/blua/lbaselib.c
src/command.c 8 additions, 3 deletions

src/command.c
src/console.c 20 additions, 7 deletions

src/console.c
src/console.h 3 additions, 0 deletions

src/console.h
src/d_clisrv.c 648 additions, 216 deletions

src/d_clisrv.c
src/d_clisrv.h 34 additions, 13 deletions

src/d_clisrv.h
src/d_event.h 4 additions, 3 deletions

src/d_event.h
src/d_main.c 103 additions, 61 deletions

src/d_main.c

with 1003 additions and 454 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