Merge branch 'metalfixes' into 'toast_cleanup' (ef984eb3) · 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

ef984eb3

Commit ef984eb3 authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'metalfixes' into 'toast_cleanup'

Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245

parents b265ab69 4ad1703a

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 4 additions, 1 deletion

src/dehacked.c
src/hardware/hw_main.c 1 addition, 1 deletion

src/hardware/hw_main.c
src/hardware/hw_md2.c 1 addition, 1 deletion

src/hardware/hw_md2.c
src/info.c 15 additions, 12 deletions

src/info.c
src/info.h 4 additions, 1 deletion

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

src/lua_baselib.c
src/p_local.h 1 addition, 1 deletion

src/p_local.h
src/p_map.c 21 additions, 0 deletions

src/p_map.c
src/p_mobj.c 273 additions, 87 deletions

src/p_mobj.c
src/p_user.c 24 additions, 21 deletions

src/p_user.c
src/r_draw.c 2 additions, 5 deletions

src/r_draw.c
src/r_things.c 1 addition, 1 deletion

src/r_things.c
src/sounds.c 2 additions, 2 deletions

src/sounds.c

with 351 additions and 135 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