Christoph Oelckers bf747075e8 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_hexen/a_clericstaff.cpp src/p_enemy.cpp src/p_interaction.cpp src/p_local.h src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp		2016-01-17 20:57:55 +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	Fixed: FOptionMenuItem::GetIndent() did not handle localized strings	2015-04-22 22:57:15 -05:00
optionmenuitems.h	Added $ check for language support for drawing Option Values	2016-01-07 12:59:16 -06:00
playerdisplay.cpp
playermenu.cpp	Merge branch 'master' into gonesolong	2014-12-20 19:13:14 -06:00
readthis.cpp
videomenu.cpp