Christoph Oelckers 2c44965f20 Merge commit 'e47b4507e4c0460dcc7f92b6f440c2f0d4832433' into whaven ... # Conflicts: # source/CMakeLists.txt		2021-03-24 19:07:23 +01: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 master into whaven	2021-03-15 10:42:59 +01: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
glstuff	- uncommented the portal code in hw_walls.cpp.	2021-03-21 19:36:55 +01:00
graphics	- consolidated crosshair drawing and added ZDoom's crosshair code.	2020-09-05 13:57:26 +02:00
shaders	- added missing shader #define.	2021-02-12 14:55:42 +01:00
zscript	Merge master into whaven	2021-03-15 10:42:59 +01:00
language.0	- backend update from GZDoom.	2021-02-26 19:06:10 +01:00
language.csv	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00
menudef.txt	Merge master into whaven	2021-03-15 10:42:59 +01: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