Merge branch 'knuxstuff' into 'master' (be5da92a) · 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

be5da92a

Commit be5da92a authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'knuxstuff' into 'master'

Knuckles gameplay changes and/or improvements

See merge request STJr/SRB2Internal!354

parents 634292a5 92be1877

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 1 addition, 0 deletions

src/dehacked.c
src/g_game.c 2 additions, 4 deletions

src/g_game.c
src/info.c 4 additions, 3 deletions

src/info.c
src/info.h 2 additions, 1 deletion

src/info.h
src/p_inter.c 16 additions, 2 deletions

src/p_inter.c
src/p_map.c 2 additions, 2 deletions

src/p_map.c
src/p_user.c 109 additions, 51 deletions

src/p_user.c

with 136 additions and 63 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