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

dc51ba6b

"README.md" did not exist on "2609745b51e41ccd5ee6ea186ef051b3d9dfabc2"

Commit dc51ba6b authored 5 years ago by ChaoLoveIceMDBoy

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook

parents 7123abd4 85fbf4f5

Branches

Tags

Loading

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 7 additions, 7 deletions

src/d_clisrv.c
src/d_clisrv.h 2 additions, 2 deletions

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

src/d_main.c
src/d_netcmd.c 2 additions, 2 deletions

src/d_netcmd.c
src/dehacked.c 14 additions, 11 deletions

src/dehacked.c
src/doomstat.h 29 additions, 26 deletions

src/doomstat.h
src/g_game.c 108 additions, 59 deletions

src/g_game.c
src/g_game.h 3 additions, 0 deletions

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

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

src/lua_baselib.c
src/lua_hook.h 4 additions, 0 deletions

src/lua_hook.h
src/lua_hooklib.c 48 additions, 1 deletion

src/lua_hooklib.c
src/lua_script.c 1 addition, 3 deletions

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

src/m_menu.c
src/p_inter.c 8 additions, 6 deletions

src/p_inter.c
src/p_map.c 8 additions, 3 deletions

src/p_map.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_setup.c 6 additions, 12 deletions

src/p_setup.c
src/p_user.c 23 additions, 20 deletions

src/p_user.c
src/st_stuff.c 83 additions, 63 deletions

src/st_stuff.c

with 396 additions and 227 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