scrawl 62774fcc4a Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp		2014-01-06 00:23:17 +01:00
..
alchemywindow.cpp	Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.	2013-11-14 14:41:10 +01:00
alchemywindow.hpp
birth.cpp
birth.hpp
bookpage.cpp
bookpage.hpp
bookwindow.cpp	Move a piece of functionality to its appropriate place	2014-01-04 01:13:19 +01:00
bookwindow.hpp	Move a piece of functionality to its appropriate place	2014-01-04 01:13:19 +01:00
charactercreation.cpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
charactercreation.hpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
class.cpp	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
class.hpp	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
companionitemmodel.cpp
companionitemmodel.hpp
companionwindow.cpp	Forgot to apply the same fix to companion window	2013-11-16 23:55:54 +01:00
companionwindow.hpp
confirmationdialog.cpp
confirmationdialog.hpp
console.cpp	Another console fix: discard text markup when getting the command line's text	2014-01-04 05:24:32 +01:00
console.hpp
container.cpp	Fix an issue with items that have no UI icon	2013-12-26 20:53:51 +01:00
container.hpp
containeritemmodel.cpp	Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.	2014-01-05 20:53:45 +01:00
containeritemmodel.hpp
controllers.cpp
controllers.hpp
countdialog.cpp
countdialog.hpp
cursor.cpp	Remove software cursor option, hw cursors seem to be working well enough	2013-11-20 06:20:16 +01:00
cursor.hpp	Remove software cursor option, hw cursors seem to be working well enough	2013-11-20 06:20:16 +01:00
dialogue.cpp	Fix highlighted topics being selectable when in a choice	2013-12-19 00:26:08 +01:00
dialogue.hpp
enchantingdialog.cpp	Play sound when enchanting	2013-11-28 11:37:30 +01:00
enchantingdialog.hpp
exposedwindow.cpp
exposedwindow.hpp
fontloader.cpp
fontloader.hpp
formatting.cpp
formatting.hpp
hud.cpp	Fixes for "Conditional jump or move depends on uninitialised value(s)"	2013-12-30 23:08:53 +01:00
hud.hpp	Breath meter flashes when drowning	2013-10-27 04:05:01 -04:00
imagebutton.cpp	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
imagebutton.hpp	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
inventoryitemmodel.cpp	Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.	2014-01-05 20:53:45 +01:00
inventoryitemmodel.hpp
inventorywindow.cpp	Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.	2014-01-05 20:53:45 +01:00
inventorywindow.hpp	Remember window positions	2013-12-05 15:46:23 +01:00
itemmodel.cpp
itemmodel.hpp
itemselection.cpp
itemselection.hpp
itemview.cpp	Fix a container window regression (oops)	2013-11-15 02:57:21 +01:00
itemview.hpp
journalbooks.cpp
journalbooks.hpp
journalviewmodel.cpp	use Entry instead of plain string for topic and quest entries	2013-12-01 14:50:25 +01:00
journalviewmodel.hpp
journalwindow.cpp	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
journalwindow.hpp
keywordsearch.cpp
keywordsearch.hpp
levelupdialog.cpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
levelupdialog.hpp
list.cpp
list.hpp
loadingscreen.cpp	Remove more unused code	2013-12-16 15:35:38 +01:00
loadingscreen.hpp	Turn off vsync while in the loading screen	2013-10-13 17:52:14 +02:00
mainmenu.cpp	block saving while chargen is in progress	2013-12-05 14:56:30 +01:00
mainmenu.hpp	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
mapwindow.cpp	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
mapwindow.hpp	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
merchantrepair.cpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
merchantrepair.hpp
messagebox.cpp	Fixes for "Conditional jump or move depends on uninitialised value(s)"	2013-12-30 23:08:53 +01:00
messagebox.hpp	Fixes for "Conditional jump or move depends on uninitialised value(s)"	2013-12-30 23:08:53 +01:00
mode.hpp	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
pickpocketitemmodel.cpp	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
pickpocketitemmodel.hpp
quickkeysmenu.cpp	Issue #1029 - Quick keys menu: Select compatible replacement when tool used up	2013-12-27 00:51:29 +01:00
quickkeysmenu.hpp
race.cpp
race.hpp
recharge.cpp	Add missing skill increases for Enchant skill	2013-11-19 07:39:07 +01:00
recharge.hpp	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
referenceinterface.cpp	removed an outdated typedef and some dead code	2013-12-05 13:21:26 +01:00
referenceinterface.hpp
repair.cpp
repair.hpp
review.cpp	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
review.hpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
savegamedialog.cpp	GUI fix: previous character was selected when saving new character	2013-12-03 15:19:13 +01:00
savegamedialog.hpp	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
scrollwindow.cpp
scrollwindow.hpp
settingswindow.cpp	Closes #990: Add option to unlock mouse cursor when in any menu	2013-12-29 00:58:48 +01:00
settingswindow.hpp	Closes #990: Add option to unlock mouse cursor when in any menu	2013-12-29 00:58:48 +01:00
sortfilteritemmodel.cpp
sortfilteritemmodel.hpp
soulgemdialog.cpp	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
soulgemdialog.hpp
spellbuyingwindow.cpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
spellbuyingwindow.hpp
spellcreationdialog.cpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
spellcreationdialog.hpp
spellicons.cpp	Implement SoulTrap magic effect	2014-01-02 21:21:28 +01:00
spellicons.hpp	Implement SoulTrap magic effect	2014-01-02 21:21:28 +01:00
spellwindow.cpp	Fix spell deletion not resetting the selected spell correctly	2014-01-05 19:40:05 +01:00
spellwindow.hpp
statswindow.cpp	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
statswindow.hpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
textinput.cpp
textinput.hpp	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
tooltips.cpp	Don't hide tooltips on mouse click. Probably wasn't such a bright idea.	2013-11-30 09:04:52 +01:00
tooltips.hpp
tradeitemmodel.cpp	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
tradeitemmodel.hpp
tradewindow.cpp	Print message to dialogue window after successful trade	2014-01-03 17:40:14 +01:00
tradewindow.hpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
trainingwindow.cpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
trainingwindow.hpp
travelwindow.cpp	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
travelwindow.hpp
waitdialog.cpp	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
waitdialog.hpp
widgets.cpp	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
widgets.hpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
windowbase.cpp
windowbase.hpp
windowmanagerimp.cpp	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
windowmanagerimp.hpp	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
windowpinnablebase.cpp
windowpinnablebase.hpp