# Conflicts:
#	src/p_spec.c

# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h

# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c

Plane movement thinker cleanup

See merge request !880

Sync crumblestate in netgames

See merge request !890

Fix minor issue with lua spriteinfo

See merge request !872

Fix emerald hunt not working properly, part 2

See merge request !887

Enable entry searching functions to retrieve entry names longer than 8 characters

See merge request !885

Add mapthing arg support.

See merge request !874

# Conflicts:
#	src/p_setup.c

Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request !882

Add mapthing scale support

See merge request !883

Flipfuncpointers (take two)

See merge request !864