Merge branch 'next' into public-musicplus-libopenmpt (81dec89a) · Commits · James Hale / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

81dec89a

Commit 81dec89a authored 5 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'next' into public-musicplus-libopenmpt

parents 09e600c0 600a3737

No related branches found

No related tags found

No related merge requests found

Changes 28

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 43 additions, 9 deletions

src/d_clisrv.c
src/d_main.c 7 additions, 7 deletions

src/d_main.c
src/d_net.h 1 addition, 1 deletion

src/d_net.h
src/d_netcmd.c 32 additions, 44 deletions

src/d_netcmd.c
src/dehacked.c 7 additions, 2 deletions

src/dehacked.c
src/doomstat.h 8 additions, 1 deletion

src/doomstat.h
src/f_finale.c 2 additions, 2 deletions

src/f_finale.c
src/g_game.c 48 additions, 0 deletions

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

src/g_game.h
src/hu_stuff.c 10 additions, 12 deletions

src/hu_stuff.c
src/lua_baselib.c 0 additions, 37 deletions

src/lua_baselib.c
src/lua_maplib.c 4 additions, 0 deletions

src/lua_maplib.c
src/m_menu.c 57 additions, 92 deletions

src/m_menu.c
src/m_menu.h 5 additions, 2 deletions

src/m_menu.h
src/p_saveg.c 0 additions, 2 deletions

src/p_saveg.c
src/p_setup.c 4 additions, 0 deletions

src/p_setup.c
src/p_slopes.c 1 addition, 1 deletion

src/p_slopes.c
src/p_spec.c 9 additions, 1 deletion

src/p_spec.c
src/p_user.c 5 additions, 2 deletions

src/p_user.c
src/r_things.c 2 additions, 2 deletions

src/r_things.c

with 246 additions and 217 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