Merge remote-tracking branch 'upstream/next' into lua-music (05b2570a) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

05b2570a

Commit 05b2570a authored 5 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/next' into lua-music

parents 9c86cd0b 5dac9c68

No related branches found

No related tags found

No related merge requests found

Changes 53

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 3 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 0 deletions

src/Makefile
src/blua/Makefile.cfg 1 addition, 0 deletions

src/blua/Makefile.cfg
src/blua/linit.c 1 addition, 0 deletions

src/blua/linit.c
src/blua/liolib.c 635 additions, 0 deletions

src/blua/liolib.c
src/blua/lualib.h 3 additions, 0 deletions

src/blua/lualib.h
src/console.c 1 addition, 10 deletions

src/console.c
src/d_clisrv.c 92 additions, 52 deletions

src/d_clisrv.c
src/d_clisrv.h 9 additions, 2 deletions

src/d_clisrv.h
src/d_main.c 18 additions, 6 deletions

src/d_main.c
src/d_net.c 10 additions, 0 deletions

src/d_net.c
src/d_netcmd.c 7 additions, 9 deletions

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

src/d_netcmd.h
src/d_netfil.c 245 additions, 7 deletions

src/d_netfil.c
src/d_netfil.h 40 additions, 0 deletions

src/d_netfil.h
src/dehacked.c 5 additions, 4 deletions

src/dehacked.c
src/f_wipe.c 1 addition, 0 deletions

src/f_wipe.c
src/g_game.c 11 additions, 12 deletions

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

src/g_game.h
src/hardware/hw3sound.c 1 addition, 1 deletion

src/hardware/hw3sound.c

with 1086 additions and 104 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