Merge branch 'master' into lua-spritedefs

src/dehacked.c

src/hardware/hw_light.c

src/info.c

src/info.h

src/p_floor.c

src/p_inter.c

src/p_map.c

src/p_mobj.c