Merge branch 'flippost' into 'master' (6815748a) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

6815748a

Commit 6815748a authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'flippost' into 'master'

Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320

parents 0ed58944 11e3f5ec

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 2 additions, 0 deletions

src/d_clisrv.c
src/d_clisrv.h 1 addition, 0 deletions

src/d_clisrv.h
src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/g_game.c 7 additions, 1 deletion

src/g_game.c
src/lua_playerlib.c 4 additions, 0 deletions

src/lua_playerlib.c
src/m_cheat.c 6 additions, 0 deletions

src/m_cheat.c
src/p_enemy.c 7 additions, 9 deletions

src/p_enemy.c
src/p_inter.c 12 additions, 0 deletions

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

src/p_local.h
src/p_mobj.c 25 additions, 10 deletions

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

src/p_saveg.c
src/p_spec.c 1 addition, 1 deletion

src/p_spec.c
src/p_telept.c 4 additions, 1 deletion

src/p_telept.c

with 73 additions and 23 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