Christoph Oelckers 1a8f11e01d Merge branch 'master' into powerslave ... # Conflicts: # source/build/src/sdlayer.cpp # source/common/menu/menu.cpp # source/sw/src/config.cpp # source/sw/src/game.cpp		2019-12-26 00:21:04 +01:00
..
graphics	- added graphics for the mouse back button and reactivated the code for it.	2019-12-04 17:55:43 +01:00
shaders/glsl	- fixed voxel lighting.	2019-12-19 17:51:33 +01:00
commonbinds.txt	- some string rework	2019-12-09 01:00:46 +01:00
confont.lmp	- fixed the sliders.	2019-12-03 20:32:35 +01:00
defbinds.txt	- key binding verification.	2019-11-30 20:18:42 +01:00
demolition.grpinfo	- added support data for the Powerslave demo.	2019-12-14 09:48:04 +01:00
dsempty.lmp	- a few sounds play, but it's still very buggy.	2019-12-15 19:00:41 +01:00
GENMIDI.op2	- initialize all dynamic music related menus.	2019-12-05 20:50:19 +01:00
language.csv	- corrected labels for Blood's weapon pickup strings.	2019-12-11 23:52:34 +01:00
leftbinds.txt	- key binding verification.	2019-11-30 20:18:42 +01:00
menudef.txt	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
newconsolefont.hex	- added the ZDoom console and made all needed changes to get it compiled.	2019-11-05 19:57:48 +01:00
origbinds.txt	- key binding verification.	2019-11-30 20:18:42 +01:00
Roboto-Regular.ttf	font	2019-11-07 20:32:49 +01:00
textcolors.txt	- WIP commit.	2019-11-23 12:38:38 +01:00