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

75ebdda3

Commit 75ebdda3 authored 4 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin' into gl-texfmt-p8-ap88-a8-ai8-fix

parents 08937f89 5e1e587e

Branches

Tags

Loading

Changes 234

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 1 addition, 1 deletion

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

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

src/CMakeLists.txt
src/Makefile 1 addition, 1 deletion

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 1 addition, 5 deletions

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

src/console.h
src/d_clisrv.c 4 additions, 9 deletions

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

src/d_clisrv.h

with 139 additions and 82 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