Merge branch 'emeraldfixes' into 'master' (8520243a) · 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

8520243a

Commit 8520243a authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'emeraldfixes' into 'master'

Special stage related fixes

See merge request STJr/SRB2Internal!269

parents 146271e4 d541bb7e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/g_game.c 7 additions, 1 deletion

src/g_game.c
src/g_game.h 3 additions, 1 deletion

src/g_game.h
src/p_inter.c 3 additions, 0 deletions

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

src/p_setup.c
src/p_tick.c 0 additions, 3 deletions

src/p_tick.c
src/p_user.c 32 additions, 8 deletions

src/p_user.c

with 46 additions and 14 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