Merge remote-tracking branch 'origin/next' into gametype-clownery (89b4a558) · 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

89b4a558

Commit 89b4a558 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into gametype-clownery

parents a657392d 6fc325f3

No related branches found

No related tags found

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!566Custom gametypes

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_mobj.c 324 additions, 462 deletions

src/p_mobj.c
src/p_saveg.c 32 additions, 57 deletions

src/p_saveg.c
src/p_setup.c 219 additions, 415 deletions

src/p_setup.c
src/p_spec.c 10 additions, 23 deletions

src/p_spec.c
src/p_user.c 1 addition, 5 deletions

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

src/r_defs.h
src/r_state.h 3 additions, 0 deletions

src/r_state.h
src/w_wad.c 98 additions, 0 deletions

src/w_wad.c
src/w_wad.h 19 additions, 0 deletions

src/w_wad.h

with 707 additions and 974 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