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

Merge branch 'udmf-plane-linedefs' into udmf-scrollers

# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
parents 0c6e2c70 5d343f9c
Branches
Tags
8 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
Showing with 794 additions and 212 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment