Merge branch 'next' into egg-capsule (a9bd307d) · 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

a9bd307d

Commit a9bd307d authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into egg-capsule

# Conflicts:
#	src/p_spec.c

parents dd50990e 887c25e0

No related branches found

No related tags found

2 merge requests!985Shaders next merge,!916Add "trigger egg capsule" linedef executor

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

src/doomdef.h 0 additions, 3 deletions

src/doomdef.h
src/hardware/hw_bsp.c 0 additions, 2 deletions

src/hardware/hw_bsp.c
src/hardware/hw_main.c 9 additions, 38 deletions

src/hardware/hw_main.c
src/lua_blockmaplib.c 0 additions, 4 deletions

src/lua_blockmaplib.c
src/p_map.c 0 additions, 4 deletions

src/p_map.c
src/p_maputl.c 72 additions, 78 deletions

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

src/p_mobj.c
src/p_polyobj.c 0 additions, 8 deletions

src/p_polyobj.c
src/p_polyobj.h 0 additions, 4 deletions

src/p_polyobj.h
src/p_saveg.c 0 additions, 16 deletions

src/p_saveg.c
src/p_setup.c 0 additions, 8 deletions

src/p_setup.c
src/p_sight.c 0 additions, 11 deletions

src/p_sight.c
src/p_spec.c 0 additions, 9 deletions

src/p_spec.c
src/p_user.c 15 additions, 34 deletions

src/p_user.c
src/r_bsp.c 10 additions, 42 deletions

src/r_bsp.c
src/r_bsp.h 0 additions, 2 deletions

src/r_bsp.h
src/r_defs.h 0 additions, 10 deletions

src/r_defs.h
src/r_plane.c 78 additions, 94 deletions

src/r_plane.c
src/r_plane.h 1 addition, 9 deletions

src/r_plane.h
src/r_segs.c 46 additions, 46 deletions

src/r_segs.c

with 231 additions and 425 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