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

48c83be8

Commit 48c83be8 authored 5 years ago by James R.

Downloads
- Plain Diff

Merge branch 'respawndelaygametyperule' into 'next'

Gametype ruleset changes

See merge request STJr/SRB2!585

parents af57468e 35ff383a

No related branches found

No related tags found

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!585Gametype ruleset changes

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

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 1 addition, 1 deletion

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
src/y_inter.c 2 additions, 2 deletions

src/y_inter.c

with 371 additions and 213 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