Merge branch 'dsz3shockwave' into 'master' (40a7b67a) · 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

40a7b67a

Commit 40a7b67a authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'dsz3shockwave' into 'master'

Deep Sea Zone 3 hardcoding

Closes #185

See merge request STJr/SRB2Internal!349

parents 65d9c528 bc128dff

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 7 additions, 1 deletion

src/dehacked.c
src/hardware/hw_light.c 1 addition, 0 deletions

src/hardware/hw_light.c
src/info.c 15 additions, 9 deletions

src/info.c
src/info.h 8 additions, 2 deletions

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

src/p_enemy.c
src/p_mobj.c 23 additions, 8 deletions

src/p_mobj.c
src/sounds.c 1 addition, 1 deletion

src/sounds.c

with 107 additions and 21 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