Merge branch 'eggcolosseum' into 'master' (63d33721) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

63d33721

Commit 63d33721 authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'eggcolosseum' into 'master'

Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248

parents 11a24b88 2df90888

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 24 additions, 11 deletions

src/dehacked.c
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/f_finale.c 1 addition, 0 deletions

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

src/hardware/hw_light.c
src/info.c 111 additions, 18 deletions

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

src/info.h
src/p_enemy.c 46 additions, 8 deletions

src/p_enemy.c
src/p_inter.c 41 additions, 3 deletions

src/p_inter.c
src/p_mobj.c 317 additions, 87 deletions

src/p_mobj.c
src/p_user.c 3 additions, 0 deletions

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

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

src/sounds.h

with 575 additions and 142 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