Merge branch 'gfz3laser-mkii' into 'next' (28063301) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

28063301

Commit 28063301 authored 4 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'gfz3laser-mkii' into 'next'

New Greenflower Zone 3 laser

See merge request STJr/SRB2!924

parents 62d5d16f 9d21d790

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 9 additions, 0 deletions

src/dehacked.c
src/hardware/hw_light.c 2 additions, 0 deletions

src/hardware/hw_light.c
src/info.c 20 additions, 10 deletions

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

src/info.h
src/p_enemy.c 107 additions, 7 deletions

src/p_enemy.c
src/p_mobj.c 1 addition, 6 deletions

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

src/sounds.c

with 151 additions and 24 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