Merge remote-tracking branch 'origin/master' into spring-things (d2c3b880) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

d2c3b880

Commit d2c3b880 authored 5 years ago by sphere

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into spring-things

parents 911b0262 b77780e1

No related branches found

No related tags found

Loading

Changes 37

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 3 additions, 5 deletions

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

src/d_netcmd.c
src/dehacked.c 12 additions, 6 deletions

src/dehacked.c
src/f_finale.c 3 additions, 0 deletions

src/f_finale.c
src/g_game.c 10 additions, 3 deletions

src/g_game.c
src/hardware/hw_light.c 62 additions, 31 deletions

src/hardware/hw_light.c
src/info.c 125 additions, 15 deletions

src/info.c
src/info.h 12 additions, 6 deletions

src/info.h
src/lua_baselib.c 1 addition, 1 deletion

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

src/lua_blockmaplib.c
src/lua_mobjlib.c 10 additions, 1 deletion

src/lua_mobjlib.c
src/lua_playerlib.c 18 additions, 3 deletions

src/lua_playerlib.c
src/lua_script.c 17 additions, 13 deletions

src/lua_script.c
src/m_cheat.c 9 additions, 2 deletions

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

src/m_menu.c
src/p_enemy.c 41 additions, 11 deletions

src/p_enemy.c
src/p_floor.c 18 additions, 13 deletions

src/p_floor.c
src/p_inter.c 38 additions, 13 deletions

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

src/p_local.h
src/p_maputl.c 3 additions, 0 deletions

src/p_maputl.c

with 409 additions and 133 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