Merge branch 'bossprovements' into 'master' (55a2f1ee) · 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

55a2f1ee

Commit 55a2f1ee authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'bossprovements' into 'master'

ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346

parents 40a7b67a ec171206

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 44 additions, 0 deletions

src/dehacked.c
src/hardware/hw_light.c 9 additions, 5 deletions

src/hardware/hw_light.c
src/info.c 173 additions, 19 deletions

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

src/info.h
src/p_enemy.c 115 additions, 19 deletions

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

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

src/p_mobj.c
src/p_user.c 6 additions, 2 deletions

src/p_user.c
src/sounds.c 4 additions, 2 deletions

src/sounds.c
src/sounds.h 2 additions, 0 deletions

src/sounds.h

with 461 additions and 52 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