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

Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 

# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c
parents bfc13c25 adce4272
No related branches found
No related tags found
9 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
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 831 additions and 387 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