Mitchell Richters 5fc7c7b1d7 Merge branch 'master' into whaven ... # Conflicts: # source/CMakeLists.txt # source/build/include/buildtypes.h # source/common/utility/m_fixed.h # source/core/console/c_notifybuffer.cpp # source/core/gamecontrol.h # source/core/inputstate.cpp # source/core/version.h		2021-02-13 18:59:58 +11:00
..
clip.cpp	- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.	2021-01-05 07:31:37 +11:00
defs.cpp	- link hires replacements to textures instead of tile numbers.	2020-11-10 20:12:46 +01:00
engine.cpp	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
engine_priv.h	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
mdsprite.cpp	- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.	2021-01-05 07:31:37 +11:00
polymost.cpp	- Move krecipasm() from pragmas.h into polymost.cpp.	2021-01-05 07:31:30 +11:00
voxmodel.cpp	- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.	2021-01-05 07:31:37 +11:00