Merge branch 'next' into bbox-tweaks

extras/conf/udb/Includes/SRB222_misc.cfg

src/CMakeLists.txt

src/g_input.c

src/lua_baselib.c

src/p_floor.c

src/p_setup.c

src/p_spec.c

src/p_spec.h