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
..
blood	- add some 21:9 presets	2021-01-18 06:25:04 -05:00
duke	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
exhumed	Revert "- Exhumed: Tune x offset alignment in DrawStatusAnims() following changes in 220283d1ec3cba03f455bd96bcf130df777b5635."	2021-01-30 10:55:58 +01:00
sw	- removed bad 'pos' setup in PreDrawStackedWater	2021-01-25 18:07:49 +01:00
whaven	- WHaven: Replace all *mulscale*() function calls with ones in m_fixed.h.	2021-01-01 19:30:04 +11:00