Christoph Oelckers 2f05a93547 Merge branch 'Packet' into back_to_basics2 ... # Conflicts: # source/core/gamestruct.h # source/games/duke/src/gameloop.cpp # source/games/duke/src/player_d.cpp		2020-08-31 00:09:56 +02:00
..
engine	Merge branch 'Packet' into back_to_basics2	2020-08-31 00:09:56 +02:00
filter	Merge branch 'Packet' into back_to_basics2	2020-08-31 00:09:56 +02: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	- prepared folder for merging.	2020-06-21 22:18:12 +02:00
shaders	- added level summary screens and made the fade for the screens an engine feature.	2020-07-01 12:55:32 +02:00
zscript	- changed the rules for dimming the menu to be more clear	2020-08-11 00:46:27 +02:00
language.csv	- added a menu option for cl_showmagamt.	2020-08-30 20:36:49 +02: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
zscript.txt	- added some ZScript basics.	2020-06-20 09:46:41 +02:00