Merge branch 'gtr-fixes' into 'next' (8c3e2728) · Commits · Ors / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

8c3e2728

Commit 8c3e2728 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'gtr-fixes' into 'next'

Gametype fixes

See merge request STJr/SRB2!816

parents 207d8aee 067d9b9a

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 7 additions, 7 deletions

src/d_netcmd.c
src/g_game.c 58 additions, 20 deletions

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

src/g_game.h
src/hu_stuff.c 1 addition, 1 deletion

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

src/lua_baselib.c
src/p_enemy.c 4 additions, 4 deletions

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

src/p_inter.c
src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_mobj.c 4 additions, 4 deletions

src/p_mobj.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_spec.c 6 additions, 6 deletions

src/p_spec.c
src/p_tick.c 1 addition, 1 deletion

src/p_tick.c
src/p_user.c 25 additions, 24 deletions

src/p_user.c
src/st_stuff.c 9 additions, 10 deletions

src/st_stuff.c
src/y_inter.c 33 additions, 33 deletions

src/y_inter.c
src/y_inter.h 4 additions, 0 deletions

src/y_inter.h

with 171 additions and 119 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