Merge branch 'next' into internal-master (91934d5a) · 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

91934d5a

Commit 91934d5a authored 10 years ago by Eidolon

Downloads
- Plain Diff

Merge branch 'next' into internal-master

Synchronize the following MRs to internal:

 * !6
 * !8
 * !9
 * !10

Conflicts:
	src/doomdef.h
	src/p_map.c

parents 2b826bd5 f7c46341

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 1 addition, 1 deletion

src/dehacked.c
src/p_enemy.c 2 additions, 2 deletions

src/p_enemy.c
src/p_local.h 3 additions, 0 deletions

src/p_local.h
src/p_map.c 12 additions, 0 deletions

src/p_map.c
src/p_polyobj.c 31 additions, 15 deletions

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

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

src/p_user.c
src/r_bsp.c 4 additions, 2 deletions

src/r_bsp.c
src/r_things.c 15 additions, 2 deletions

src/r_things.c

with 74 additions and 22 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