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

2778cc3c

Commit 2778cc3c authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into hooklib-refactor

parents dbd8903a 29745f80

No related branches found

No related tags found

Loading

Changes 31

Hide whitespace changes

Inline Side-by-side

Showing

src/blua/lcode.c 12 additions, 19 deletions

src/blua/lcode.c
src/d_clisrv.c 24 additions, 19 deletions

src/d_clisrv.c
src/d_main.c 1 addition, 5 deletions

src/d_main.c
src/d_netcmd.c 9 additions, 5 deletions

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

src/d_player.h
src/deh_tables.c 32 additions, 0 deletions

src/deh_tables.c
src/dehacked.c 6 additions, 0 deletions

src/dehacked.c
src/g_game.c 27 additions, 0 deletions

src/g_game.c
src/hardware/hw_draw.c 2 additions, 2 deletions

src/hardware/hw_draw.c
src/info.c 2 additions, 2 deletions

src/info.c
src/lua_baselib.c 2 additions, 0 deletions

src/lua_baselib.c
src/lua_hudlib.c 4 additions, 2 deletions

src/lua_hudlib.c
src/lua_libs.h 2 additions, 0 deletions

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

src/lua_maplib.c
src/lua_mathlib.c 12 additions, 0 deletions

src/lua_mathlib.c
src/lua_playerlib.c 8 additions, 0 deletions

src/lua_playerlib.c
src/lua_skinlib.c 62 additions, 5 deletions

src/lua_skinlib.c
src/m_menu.c 2 additions, 4 deletions

src/m_menu.c
src/p_enemy.c 8 additions, 0 deletions

src/p_enemy.c
src/p_inter.c 4 additions, 0 deletions

src/p_inter.c

with 222 additions and 64 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