Merge branch 'ringsparkle' into 'master' (5585059f) · 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

5585059f

Commit 5585059f authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'ringsparkle' into 'master'

New ring sparkles

See merge request STJr/SRB2Internal!271

parents af07412a 153ed828

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, 13 deletions

src/dehacked.c
src/info.c 3 additions, 16 deletions

src/info.c
src/info.h 1 addition, 13 deletions

src/info.h
src/p_enemy.c 24 additions, 0 deletions

src/p_enemy.c
src/p_mobj.h 2 additions, 0 deletions

src/p_mobj.h
src/p_saveg.c 2 additions, 0 deletions

src/p_saveg.c
src/p_setup.c 1 addition, 0 deletions

src/p_setup.c

with 34 additions and 42 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