Skip to content
Snippets Groups Projects
Commit d89050f0 authored by toaster's avatar toaster
Browse files

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang

# Conflicts:
#	src/r_defs.h
parents 0b110842 7deb18bd
No related branches found
No related tags found
2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!652Hexafaceted sprite angle support.
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 to comment