Skip to content
Snippets Groups Projects
Commit 245d5be0 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'movement-refactor' into udmf-fofs-mkii 

# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
parents 21eccc15 452fd100
No related branches found
No related tags found
10 merge requests!1714UDMF: The whole thing,!1696UDMF: Sector fields,!1694UDMF: More linedef types,!1693UDMF: Thing types,!1680UDMF: Linedef executor triggers,!1621UDMF: Lighting,!1572UDMF: PolyObject actions,!1564UDMF: Scrollers and pushers,!1557UDMF: Plane movers,!915UDMF FOFs
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