Christoph Oelckers 7ba577e1b0 Merge branch 'master' into scripting ... Conflicts: src/g_heretic/a_hereticweaps.cpp src/thingdef/thingdef_codeptr.cpp		2015-06-07 09:43:54 +02:00
..
colorpickermenu.cpp	- merged menu branch back into trunk.	2010-09-14 17:28:18 +00:00
joystickmenu.cpp	- Fixed: All clang 5.0 warnings.	2014-01-05 19:50:09 -05:00
listmenu.cpp	Draw player setup cursor equivalently to options menu cursors	2014-12-26 19:22:09 -06:00
loadsavemenu.cpp	- Use a more conformant C++ preprocessor macro identifier for Unix systems.	2013-07-30 11:46:14 +02:00
menu.cpp	Merge branch 'master' into scripting	2013-08-18 12:18:59 +02:00
menu.h	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
menudef.cpp	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
menuinput.cpp	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
messagebox.cpp	- Moved all BorderNeedRefresh and SB_state updating code into separate functions that won't crash if screen is NULL.	2013-02-27 03:10:25 +00:00
optionmenu.cpp	Fixed: FOptionMenuItem::GetIndent() did not handle localized strings	2015-04-22 22:57:15 -05:00
optionmenuitems.h	- added Zandronum's text input menu items.	2015-05-28 09:22:48 +02:00
playerdisplay.cpp	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
playermenu.cpp	Merge branch 'master' into gonesolong	2014-12-20 19:13:14 -06:00
readthis.cpp	replaced all character arrays for lump/texture names in the level_info_t and FLevelLocals structures with FStrings as first preparation for allowing long texture names.	2014-05-13 11:33:59 +02:00
videomenu.cpp	- Improve letterboxing in fullscreen by taking into account animorphic ratio settings.	2014-12-11 01:35:27 -05:00