Christoph Oelckers bba092cc0b Merge branch 'master' into scripting ... Conflicts: src/d_player.h src/g_doom/a_archvile.cpp src/thingdef/thingdef.h src/thingdef/thingdef_properties.cpp		2013-08-09 13:03:28 +02:00
..
colorpickermenu.cpp	- merged menu branch back into trunk.	2010-09-14 17:28:18 +00:00
joystickmenu.cpp	- In UpdateJoystickConfigMenu(), do not access joy before checking if it's NULL.	2013-01-03 03:12:07 +00:00
listmenu.cpp	. added AFADoomer's patch to set a text highlight color for the list menu.	2013-05-31 22:10:12 +00:00
loadsavemenu.cpp	- Use a more conformant C++ preprocessor macro identifier for Unix systems.	2013-07-30 11:46:14 +02:00
menu.cpp	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
menu.h	. added AFADoomer's patch to set a text highlight color for the list menu.	2013-05-31 22:10:12 +00:00
menudef.cpp	- Use a more conformant C++ preprocessor macro identifier for Unix systems.	2013-07-30 11:46:14 +02:00
menuinput.cpp	- merged menu branch back into trunk.	2010-09-14 17:28:18 +00: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	- Remove LabelOffset from menus entirely and just compute things so that the console font and	2012-07-26 05:27:37 +00:00
optionmenuitems.h	- Remove LabelOffset from menus entirely and just compute things so that the console font and	2012-07-26 05:27:37 +00:00
playerdisplay.cpp	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
playermenu.cpp	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
readthis.cpp	- fixed: The help screens were stretched on 16:9 displays	2011-01-14 09:22:09 +00:00
videomenu.cpp	- Changed vid_tft's default to true. How many people still run 1280x1024 on a CRT these days?	2012-08-10 02:56:09 +00:00