Merge branch 'toast_cleanup' into 'master' (3e305c09) · 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

3e305c09

Commit 3e305c09 authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'toast_cleanup' into 'master'

PITY IN PINK and everything associated (formerly toast_fixes)

See merge request STJr/SRB2Internal!232

parents c1bea02f ef984eb3

No related branches found

No related tags found

Loading

Changes 26

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/dehacked.c 22 additions, 1 deletion

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

src/hardware/hw_light.c
src/hardware/hw_main.c 5 additions, 3 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 131 additions, 33 deletions

src/hardware/hw_md2.c
src/info.c 60 additions, 22 deletions

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

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

src/lua_baselib.c
src/lua_hook.h 3 additions, 1 deletion

src/lua_hook.h
src/lua_hooklib.c 622 additions, 522 deletions

src/lua_hooklib.c
src/lua_hudlib.c 2 additions, 2 deletions

src/lua_hudlib.c
src/lua_mobjlib.c 10 additions, 4 deletions

src/lua_mobjlib.c
src/p_enemy.c 12 additions, 4 deletions

src/p_enemy.c
src/p_inter.c 58 additions, 28 deletions

src/p_inter.c
src/p_local.h 3 additions, 1 deletion

src/p_local.h
src/p_map.c 73 additions, 43 deletions

src/p_map.c
src/p_mobj.c 317 additions, 104 deletions

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

src/p_mobj.h
src/p_saveg.c 9 additions, 5 deletions

src/p_saveg.c
src/p_user.c 194 additions, 24 deletions

src/p_user.c

with 1557 additions and 800 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