Christoph Oelckers 7ba152e588 Merge branch 'master' into whaven ... # Conflicts: # source/core/gameinput.h # source/core/version.h # source/games/exhumed/src/enginesubs.cpp # source/games/sw/src/game.cpp		2021-11-12 11:19: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 branch 'master' into whaven	2021-11-12 11:19:23 +01:00
filter	Merge branch 'master' into whaven	2021-10-28 09:45:52 +11: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	- Backend update from GZDoom.	2021-10-07 22:46:45 +02:00
shaders_gles	Fix fade for GLES	2021-10-24 18:35:54 +02:00
zscript	Merge branch 'master' into whaven	2021-11-12 11:19:23 +01:00
language.0	- text update	2021-10-16 15:36:34 +02:00
language.csv	Merge branch 'master' into whaven	2021-10-28 09:45:52 +11:00
menudef.txt	Merge branch 'master' into whaven	2021-11-12 11:19:23 +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
vga-rom-font.16	- enabled the ENDOOM-like text screens when quitting Duke and SW.	2021-05-31 23:16:52 +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	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00