Merge branch 'keep-body' into 'next' (53e2cfbd) · 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

53e2cfbd

Commit 53e2cfbd authored 5 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'keep-body' into 'next'

Let clients rejoin the server without losing their status

See merge request !722

parents d654bbc7 8bd897a2

No related branches found

No related tags found

Loading

Changes 19

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 1 addition, 1 deletion

src/command.c
src/d_clisrv.c 200 additions, 118 deletions

src/d_clisrv.c
src/d_clisrv.h 4 additions, 1 deletion

src/d_clisrv.h
src/d_netcmd.c 18 additions, 17 deletions

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

src/d_player.h
src/g_game.c 69 additions, 61 deletions

src/g_game.c
src/g_game.h 3 additions, 1 deletion

src/g_game.h
src/hu_stuff.c 7 additions, 7 deletions

src/hu_stuff.c
src/lua_consolelib.c 1 addition, 1 deletion

src/lua_consolelib.c
src/lua_hook.h 1 addition, 1 deletion

src/lua_hook.h
src/lua_hooklib.c 1 addition, 1 deletion

src/lua_hooklib.c
src/lua_playerlib.c 4 additions, 0 deletions

src/lua_playerlib.c
src/p_enemy.c 3 additions, 0 deletions

src/p_enemy.c
src/p_inter.c 2 additions, 2 deletions

src/p_inter.c
src/p_saveg.c 2 additions, 0 deletions

src/p_saveg.c
src/p_setup.c 3 additions, 3 deletions

src/p_setup.c
src/p_spec.c 10 additions, 2 deletions

src/p_spec.c
src/p_tick.c 16 additions, 2 deletions

src/p_tick.c
src/p_user.c 9 additions, 2 deletions

src/p_user.c

with 355 additions and 220 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