Merge branch 'delag_maces' into 'master' (5f79a2f1) · 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

5f79a2f1

Commit 5f79a2f1 authored 6 years ago by toaster

Downloads
- Plain Diff

Merge branch 'delag_maces' into 'master'

Delag Maces

See merge request STJr/SRB2Internal!141

parents e1cd6357 790e334d

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 0 additions, 1 deletion

src/dehacked.c
src/info.c 8 additions, 8 deletions

src/info.c
src/lua_baselib.c 14 additions, 0 deletions

src/lua_baselib.c
src/lua_mobjlib.c 14 additions, 2 deletions

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

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

src/p_inter.c
src/p_local.h 2 additions, 0 deletions

src/p_local.h
src/p_mobj.c 301 additions, 166 deletions

src/p_mobj.c
src/p_mobj.h 0 additions, 1 deletion

src/p_mobj.h
src/p_user.c 1 addition, 12 deletions

src/p_user.c

with 350 additions and 197 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