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

85fb02aa

Commit 85fb02aa authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions

# Conflicts:
#	src/p_inter.c
#	src/p_user.c
#	src/st_stuff.c

parents b7298a55 eab2df56

Branches

Tags

Loading

Changes 28

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 3 additions, 4 deletions

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

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

src/d_netcmd.c
src/d_player.h 2 additions, 4 deletions

src/d_player.h
src/dehacked.c 16 additions, 0 deletions

src/dehacked.c
src/g_game.c 2 additions, 1 deletion

src/g_game.c
src/hardware/hw_draw.c 11 additions, 4 deletions

src/hardware/hw_draw.c
src/hu_stuff.c 18 additions, 18 deletions

src/hu_stuff.c
src/info.c 47 additions, 47 deletions

src/info.c
src/lua_baselib.c 49 additions, 1 deletion

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

src/lua_hook.h
src/lua_hooklib.c 30 additions, 22 deletions

src/lua_hooklib.c
src/lua_mobjlib.c 8 additions, 0 deletions

src/lua_mobjlib.c
src/lua_playerlib.c 4 additions, 4 deletions

src/lua_playerlib.c
src/m_cheat.c 3 additions, 3 deletions

src/m_cheat.c
src/m_menu.c 2 additions, 2 deletions

src/m_menu.c
src/p_enemy.c 10 additions, 9 deletions

src/p_enemy.c
src/p_inter.c 207 additions, 130 deletions

src/p_inter.c
src/p_local.h 6 additions, 1 deletion

src/p_local.h
src/p_mobj.c 276 additions, 244 deletions

src/p_mobj.c

with 701 additions and 500 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