Skip to content
Snippets Groups Projects
Commit 9dbfa28d authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'udmf-next' into udmf-fofs-mkii 

# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
parents 02c2aeb4 d07c376f
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
Showing
with 686 additions and 334 deletions
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