Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks (1f15209e) · 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

1f15209e

Commit 1f15209e authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks

# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c

parents a3f758f3 29bf8982

No related branches found

No related tags found

Loading

Changes 29

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 2 additions, 5 deletions

src/d_clisrv.c
src/d_netcmd.c 2 additions, 3 deletions

src/d_netcmd.c
src/dehacked.c 2 additions, 4 deletions

src/dehacked.c
src/f_finale.c 1 addition, 4 deletions

src/f_finale.c
src/g_game.c 3 additions, 11 deletions

src/g_game.c
src/hardware/hw_light.c 2 additions, 6 deletions

src/hardware/hw_light.c
src/lua_maplib.c 0 additions, 12 deletions

src/lua_maplib.c
src/lua_script.c 16 additions, 13 deletions

src/lua_script.c
src/lua_thinkerlib.c 7 additions, 7 deletions

src/lua_thinkerlib.c
src/m_cheat.c 3 additions, 9 deletions

src/m_cheat.c
src/p_ceilng.c 2 additions, 2 deletions

src/p_ceilng.c
src/p_enemy.c 9 additions, 36 deletions

src/p_enemy.c
src/p_floor.c 7 additions, 10 deletions

src/p_floor.c
src/p_inter.c 8 additions, 32 deletions

src/p_inter.c
src/p_lights.c 5 additions, 5 deletions

src/p_lights.c
src/p_local.h 13 additions, 7 deletions

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

src/p_map.c
src/p_mobj.c 12 additions, 39 deletions

src/p_mobj.c
src/p_polyobj.c 42 additions, 73 deletions

src/p_polyobj.c
src/p_saveg.c 607 additions, 522 deletions

src/p_saveg.c

with 744 additions and 801 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