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

e66491e6

Commit e66491e6 authored 9 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git

parents 65329938 c956b498

Branches

Tags

No related merge requests found

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 41 additions, 25 deletions

src/d_netcmd.c
src/dehacked.c 104 additions, 40 deletions

src/dehacked.c
src/doomdef.h 4 additions, 0 deletions

src/doomdef.h
src/doomstat.h 10 additions, 12 deletions

src/doomstat.h
src/f_finale.c 14 additions, 10 deletions

src/f_finale.c
src/g_game.c 12 additions, 8 deletions

src/g_game.c
src/lua_baselib.c 47 additions, 2 deletions

src/lua_baselib.c
src/lua_hooklib.c 29 additions, 0 deletions

src/lua_hooklib.c
src/lua_maplib.c 4 additions, 4 deletions

src/lua_maplib.c
src/lua_script.c 2 additions, 26 deletions

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

src/lua_script.h
src/m_menu.c 8 additions, 8 deletions

src/m_menu.c
src/p_enemy.c 2 additions, 6 deletions

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

src/p_inter.c
src/p_saveg.c 1 addition, 1 deletion

src/p_saveg.c
src/p_setup.c 28 additions, 11 deletions

src/p_setup.c
src/p_spec.c 7 additions, 8 deletions

src/p_spec.c
src/p_user.c 13 additions, 13 deletions

src/p_user.c
src/s_sound.c 282 additions, 302 deletions

src/s_sound.c
src/s_sound.h 13 additions, 9 deletions

src/s_sound.h

with 624 additions and 487 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