Merge branch 'metalstuff' into 'master' (9e9e6a8f) · Commits · santiago azael / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

9e9e6a8f

Commit 9e9e6a8f authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'metalstuff' into 'master'

Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413

parents b6905f27 e89948ce

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 4 additions, 0 deletions

src/d_player.h
src/dehacked.c 5 additions, 0 deletions

src/dehacked.c
src/info.c 30 additions, 0 deletions

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

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

src/p_inter.c
src/p_user.c 142 additions, 12 deletions

src/p_user.c
src/r_draw.c 37 additions, 1 deletion

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

src/r_draw.h
src/r_things.c 14 additions, 0 deletions

src/r_things.c

with 240 additions and 13 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