Merge branch 'bustables_misc' into 'master' (af38c0e2) · 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

af38c0e2

Commit af38c0e2 authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'bustables_misc' into 'master'

Bustables and landing events

Closes #157 and #162

See merge request STJr/SRB2Internal!262

parents 94c1873b f2349c5c

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/lua_baselib.c 14 additions, 4 deletions

src/lua_baselib.c
src/p_floor.c 36 additions, 14 deletions

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

src/p_local.h
src/p_map.c 7 additions, 1 deletion

src/p_map.c
src/p_mobj.c 3 additions, 3 deletions

src/p_mobj.c
src/p_user.c 57 additions, 41 deletions

src/p_user.c

with 118 additions and 64 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