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

001dbcce

Commit 001dbcce authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge branch 'musicplus-core' into musicplus-sdlmixerx

parents 4494630c 45dbadbb

Loading

Changes 38

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 15 additions, 2 deletions

src/d_netcmd.c
src/d_player.h 13 additions, 1 deletion

src/d_player.h
src/dehacked.c 67 additions, 1 deletion

src/dehacked.c
src/doomstat.h 2 additions, 0 deletions

src/doomstat.h
src/g_game.c 24 additions, 15 deletions

src/g_game.c
src/hu_stuff.c 2 additions, 2 deletions

src/hu_stuff.c
src/i_tcp.c 26 additions, 42 deletions

src/i_tcp.c
src/info.c 570 additions, 18 deletions

src/info.c
src/info.h 58 additions, 0 deletions

src/info.h
src/lua_maplib.c 2 additions, 0 deletions

src/lua_maplib.c
src/lua_playerlib.c 36 additions, 0 deletions

src/lua_playerlib.c
src/m_cheat.c 58 additions, 31 deletions

src/m_cheat.c
src/m_cheat.h 1 addition, 2 deletions

src/m_cheat.h
src/m_menu.c 7 additions, 21 deletions

src/m_menu.c
src/p_enemy.c 181 additions, 5 deletions

src/p_enemy.c
src/p_inter.c 15 additions, 13 deletions

src/p_inter.c
src/p_local.h 2 additions, 0 deletions

src/p_local.h
src/p_map.c 18 additions, 5 deletions

src/p_map.c
src/p_mobj.c 61 additions, 8 deletions

src/p_mobj.c
src/p_saveg.c 57 additions, 17 deletions

src/p_saveg.c

with 1215 additions and 183 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