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
..
credits	- aded widescreen assets for all games except Exhumed where usage rights have not been fully cleared yet.	2020-09-16 19:13:05 +02:00
engine	Merge branch 'master' into witchaven2	2021-01-01 17:32:32 +11:00
filter	- remap WH's fly to 'quick_kick', because crouch got refactored.	2020-11-08 10:51:19 +01:00
fonts/consolefont	- added ZDoom's menu system as a base to build a new menu on.	2019-11-21 18:03:09 +01:00
graphics	- consolidated crosshair drawing and added ZDoom's crosshair code.	2020-09-05 13:57:26 +02:00
shaders	- disable palette emulation when map global fog is active.	2020-10-03 18:04:07 +02:00
zscript	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
language.0	- language update	2021-01-18 06:26:14 -05:00
language.csv	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
menudef.txt	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
newconsolefont.hex	- use GZDoom's font code to fix the crash issues and moved around some files in the PK3.	2020-05-24 23:28:44 +02:00
textcolors.txt	- ported the level stats display to be game independent.	2020-07-02 23:56:22 +02:00
x11r6rgb.txt	- backend code matching with GZDoom	2020-04-12 08:30:40 +02:00
xhairs.txt	- consolidated crosshair drawing and added ZDoom's crosshair code.	2020-09-05 13:57:26 +02:00
zscript.txt	- implemented the WH2 menu.	2020-10-31 14:07:38 +01:00