Merge branch 'new-acz-minecarts' into 'master' (e20949ef) · 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

e20949ef

Commit e20949ef authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'new-acz-minecarts' into 'master'

ACZ hardcoding (including minecarts)

See merge request STJr/SRB2Internal!231

parents 149a8bb7 287c25b8

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/dehacked.c 173 additions, 10 deletions

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

src/hardware/hw_light.c
src/info.c 962 additions, 119 deletions

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

src/info.h
src/p_enemy.c 1079 additions, 43 deletions

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

src/p_inter.c
src/p_local.h 1 addition, 0 deletions

src/p_local.h
src/p_map.c 83 additions, 4 deletions

src/p_map.c
src/p_mobj.c 224 additions, 30 deletions

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

src/p_user.c
src/sounds.c 12 additions, 10 deletions

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

src/sounds.h

with 3256 additions and 230 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