Merge branch 'next' into 'lua-inputs' (cfa48574) · Commits · James Hale / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

cfa48574

Commit cfa48574 authored 3 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'next' into 'lua-inputs'

# Conflicts:
#   src/lua_script.c

parents 3895c023 357b6412

Branches lua-inputs

No related tags found

No related merge requests found

Changes 241

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 0 deletions

README.md
appveyor.yml 1 addition, 1 deletion

appveyor.yml
extras/conf/SRB2-22.cfg 210 additions, 42 deletions

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

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

src/Makefile
src/Makefile.cfg 3 additions, 3 deletions

src/Makefile.cfg
src/am_map.c 1 addition, 1 deletion

src/am_map.c
src/am_map.h 1 addition, 1 deletion

src/am_map.h
src/apng.c 1 addition, 1 deletion

src/apng.c
src/apng.h 1 addition, 1 deletion

src/apng.h
src/asm_defs.inc 1 addition, 1 deletion

src/asm_defs.inc
src/b_bot.c 1 addition, 1 deletion

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

src/b_bot.h
src/byteptr.h 1 addition, 1 deletion

src/byteptr.h
src/command.c 9 additions, 8 deletions

src/command.c
src/command.h 1 addition, 1 deletion

src/command.h
src/config.h.in 3 additions, 2 deletions

src/config.h.in
src/console.c 7 additions, 5 deletions

src/console.c
src/console.h 1 addition, 1 deletion

src/console.h
src/d_clisrv.c 7 additions, 16 deletions

src/d_clisrv.c

with 258 additions and 91 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