Merge branch 'next' into udmf-next (3170f2b8) · 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

3170f2b8

Commit 3170f2b8 authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into udmf-next

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

parents a3c90093 d1d006a1

No related branches found

No related tags found

Loading

Changes 19

Expand all Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 2 additions, 0 deletions

extras/conf/SRB2-22.cfg
src/lua_infolib.c 0 additions, 1 deletion

src/lua_infolib.c
src/lua_mobjlib.c 1 addition, 0 deletions

src/lua_mobjlib.c
src/lua_script.c 2 additions, 2 deletions

src/lua_script.c
src/p_ceilng.c 6 additions, 10 deletions

src/p_ceilng.c
src/p_floor.c 451 additions, 864 deletions

src/p_floor.c
src/p_mobj.c 4 additions, 3 deletions

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

src/p_mobj.h
src/p_saveg.c 296 additions, 55 deletions

src/p_saveg.c
src/p_setup.c 19 additions, 39 deletions

src/p_setup.c
src/p_spec.c 74 additions, 154 deletions

src/p_spec.c
src/p_spec.h 109 additions, 20 deletions

src/p_spec.h
src/p_user.c 2 additions, 2 deletions

src/p_user.c
src/r_defs.h 10 additions, 0 deletions

src/r_defs.h
src/r_segs.c 7 additions, 15 deletions

src/r_segs.c
src/r_things.c 32 additions, 36 deletions

src/r_things.c
src/r_things.h 2 additions, 1 deletion

src/r_things.h
src/w_wad.c 57 additions, 38 deletions

src/w_wad.c
src/w_wad.h 4 additions, 3 deletions

src/w_wad.h

with 1081 additions and 1243 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