Merge remote-tracking branch 'origin/master' into next (64af7bad) · 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

64af7bad

Commit 64af7bad authored 5 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 63cf9d61 1e136040

No related branches found

No related tags found

1 merge request!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/doomdef.h 4 additions, 0 deletions

src/doomdef.h
src/hardware/hw_cache.c 36 additions, 32 deletions

src/hardware/hw_cache.c
src/hardware/hw_defs.h 1 addition, 1 deletion

src/hardware/hw_defs.h
src/hardware/hw_glob.h 0 additions, 1 deletion

src/hardware/hw_glob.h
src/p_spec.c 21 additions, 5 deletions

src/p_spec.c
src/r_data.c 167 additions, 9 deletions

src/r_data.c
src/r_data.h 12 additions, 0 deletions

src/r_data.h

with 241 additions and 48 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