Merge branch 'gametype-clownery' into 'next' (e6532b9b) · Commits · STJr / SRB2 · GitLab

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

e6532b9b

Commit e6532b9b authored 5 years ago by James R.

Downloads
- Plain Diff

Merge branch 'gametype-clownery' into 'next'

Custom gametypes

See merge request !566

parents ca5a4d90 61a01973

No related branches found

No related tags found

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!566Custom gametypes

Changes 28

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 19 additions, 11 deletions

src/d_clisrv.c
src/d_main.c 3 additions, 3 deletions

src/d_main.c
src/d_netcmd.c 51 additions, 15 deletions

src/d_netcmd.c
src/dehacked.c 397 additions, 226 deletions

src/dehacked.c
src/doomstat.h 81 additions, 24 deletions

src/doomstat.h
src/g_game.c 274 additions, 30 deletions

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

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

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

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

src/lua_hook.h
src/lua_hooklib.c 101 additions, 0 deletions

src/lua_hooklib.c
src/lua_hud.h 5 additions, 1 deletion

src/lua_hud.h
src/lua_hudlib.c 36 additions, 3 deletions

src/lua_hudlib.c
src/lua_script.c 238 additions, 2 deletions

src/lua_script.c
src/lua_script.h 2 additions, 0 deletions

src/lua_script.h
src/m_cheat.c 1 addition, 1 deletion

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

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

src/m_menu.h
src/p_enemy.c 4 additions, 4 deletions

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

src/p_inter.c

with 1415 additions and 359 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