Merge remote-tracking branch 'origin/master' into cmake-adjustments (4985d943) · 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

4985d943

Commit 4985d943 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into cmake-adjustments

parents 8fc41453 6f8dfb6f

No related branches found

No related tags found

Loading

Changes 157

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 4 additions, 1 deletion

CMakeLists.txt
appveyor.yml 3 additions, 3 deletions

appveyor.yml
extras/conf/SRB2-22.cfg 44 additions, 13 deletions

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

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

src/Makefile
src/Makefile.cfg 61 additions, 24 deletions

src/Makefile.cfg
src/am_map.c 2 additions, 5 deletions

src/am_map.c
src/blua/lbaselib.c 26 additions, 0 deletions

src/blua/lbaselib.c
src/blua/liolib.c 15 additions, 10 deletions

src/blua/liolib.c
src/command.c 1 addition, 1 deletion

src/command.c
src/config.h.in 4 additions, 2 deletions

src/config.h.in
src/console.c 1 addition, 4 deletions

src/console.c
src/d_clisrv.c 647 additions, 128 deletions

src/d_clisrv.c
src/d_clisrv.h 32 additions, 8 deletions

src/d_clisrv.h
src/d_main.c 117 additions, 4 deletions

src/d_main.c
src/d_net.c 7 additions, 3 deletions

src/d_net.c
src/d_netcmd.c 84 additions, 53 deletions

src/d_netcmd.c
src/d_netfil.c 485 additions, 142 deletions

src/d_netfil.c
src/d_netfil.h 27 additions, 12 deletions

src/d_netfil.h
src/d_player.h 10 additions, 2 deletions

src/d_player.h

with 1574 additions and 420 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