Merge branch 'udmf-scrollers' into udmf-polyobjects (f672b1b9) · 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

f672b1b9

Commit f672b1b9 authored 2 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'udmf-scrollers' into udmf-polyobjects

# Conflicts:
#	src/p_spec.c

parents 7d2a188c f1648096

Loading

Changes 239

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 1 addition, 1 deletion

appveyor.yml
assets/CMakeLists.txt 1 addition, 2 deletions

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

assets/README.txt
extras/conf/SRB2-22.cfg 24 additions, 10 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_things.cfg 3 additions, 3 deletions

extras/conf/udb/Includes/SRB222_things.cfg
src/Makefile 2 additions, 2 deletions

src/Makefile
src/Makefile.d/features.mk 75 additions, 75 deletions

src/Makefile.d/features.mk
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 41 additions, 21 deletions

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

src/b_bot.h
src/byteptr.h 76 additions, 24 deletions

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

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

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

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

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

src/console.h

with 261 additions and 176 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