Skip to content
Snippets Groups Projects
Commit 97adf3e2 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'next' into hoop_refactor 

# Conflicts:
#	src/p_mobj.c
parents dacd5614 cbb9c7c1
No related branches found
No related tags found
2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!560Make both NiGHTS hoop types use the same spawning code.
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment