Christoph Oelckers fbaab5044d Merge commit '38df0665e3a2018cf1d0028a36357df6c7e908e9' into scripting ... Conflicts: src/d_dehacked.cpp src/decallib.cpp src/g_hexen/a_clericstaff.cpp src/p_interaction.cpp src/p_local.h src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/constants.txt wadsrc/static/actors/shared/inventory.txt		2016-01-17 19:50:34 +01:00
..
colorpickermenu.cpp
joystickmenu.cpp	Fixed memory leak in joystick menu	2015-09-05 14:12:52 +12:00
listmenu.cpp	Fixed crash when clicking on back button in main menu	2015-10-10 15:03:14 +03:00
loadsavemenu.cpp
menu.cpp
menu.h	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
menudef.cpp	Print warning to console if unknown texture found in menu definition	2015-10-07 12:13:11 +03:00
menuinput.cpp	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
messagebox.cpp
optionmenu.cpp
optionmenuitems.h	- use the recently added text input menu item to add the config file for GUS, the patch set for Fluidsynth and the timidity.exe path for Timidity++ to the menu. Even though there is no proper file select box, this is still better than nothing.	2015-11-28 12:43:01 +01:00
playerdisplay.cpp
playermenu.cpp
readthis.cpp
videomenu.cpp