Merge branch 'next' into 'resend-gamestate' (60cd6fe9) · 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

60cd6fe9

Commit 60cd6fe9 authored 5 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'next' into 'resend-gamestate'

# Conflicts:
#   src/d_clisrv.c

parents 46d8546f 76bda716

No related branches found

No related tags found

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
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 637 additions, 0 deletions

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

src/blua/lualib.h
src/d_clisrv.c 28 additions, 0 deletions

src/d_clisrv.c
src/d_clisrv.h 6 additions, 0 deletions

src/d_clisrv.h
src/d_main.c 8 additions, 1 deletion

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

src/d_net.c
src/d_netcmd.c 3 additions, 1 deletion

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 4 additions, 4 deletions

src/dehacked.c
src/lua_hooklib.c 30 additions, 2 deletions

src/lua_hooklib.c

with 1018 additions and 15 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