Marc Zinnschlag 3f846a50d9 Merge remote-tracking branch 'galdor557/master' ...

Conflicts:
	apps/openmw/mwgui/travelwindow.cpp

2013-04-11 10:15:42 +02:00

..

alchemywindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

alchemywindow.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

birth.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

birth.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

bookwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

bookwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

charactercreation.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

charactercreation.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

class.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

class.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

companionwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

companionwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

confirmationdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

confirmationdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

console.cpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

console.hpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

container.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

container.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

countdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

countdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

cursor.cpp

Fix manually changed mouse cursor

2013-03-07 12:46:26 +01:00

cursor.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

dialogue.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

dialogue.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

dialoguehistory.cpp

MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions

2013-04-10 00:32:05 -04:00

dialoguehistory.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

enchantingdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

enchantingdialog.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

exposedwindow.cpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

exposedwindow.hpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

formatting.cpp

Fixed book text misalignment, at least in some cases

2013-02-12 11:49:20 +04:00

formatting.hpp

BookTextParser: moved to Ogre::UTFString

2013-02-12 11:22:19 +04:00

hud.cpp

Companion UI

2013-03-31 13:13:46 +02:00

hud.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

imagebutton.cpp

Fix menu/journal/book/scroll buttons when using localised MW-installations

2013-01-03 01:09:03 +01:00

imagebutton.hpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

inventorywindow.cpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

inventorywindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

itemselection.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

itemselection.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

journalwindow.cpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

journalwindow.hpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

levelupdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

levelupdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

list.cpp

Fix topics that have the same name as a service opening that service when clicked

2013-03-09 21:50:01 +01:00

list.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

loadingscreen.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

loadingscreen.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

mainmenu.cpp

added missing click sound to main menu

2013-02-26 19:37:47 +01:00

mainmenu.hpp

Fix menu/journal/book/scroll buttons when using localised MW-installations

2013-01-03 01:09:03 +01:00

mapwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

mapwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

merchantrepair.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

merchantrepair.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

messagebox.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

messagebox.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

mode.hpp

Companion UI

2013-03-31 13:13:46 +02:00

quickkeysmenu.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

quickkeysmenu.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

race.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

race.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

referenceinterface.cpp

Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.

2013-03-31 15:50:48 +02:00

referenceinterface.hpp

Fixed some windows issues and got rid of a few tiny warnings while at it.

2012-07-07 01:14:18 +02:00

repair.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

repair.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

review.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

review.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

scrollwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

scrollwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

settingswindow.cpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

settingswindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

soulgemdialog.cpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

soulgemdialog.hpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

spellbuyingwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

spellbuyingwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

spellcreationdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

spellcreationdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

spellicons.cpp

Fix the spell icon panel being visible when it shouldn't.

2013-03-27 18:04:15 +01:00

spellicons.hpp

Magic effect icons for spells

2013-03-03 12:01:19 +01:00

spellwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

spellwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

statswindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

statswindow.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

textinput.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

textinput.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

tooltips.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

tooltips.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

tradewindow.cpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

tradewindow.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

trainingwindow.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

trainingwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

travelwindow.cpp

Merge remote-tracking branch 'galdor557/master'

2013-04-11 10:15:42 +02:00

travelwindow.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

waitdialog.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

waitdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

widgets.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

widgets.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

windowbase.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

windowbase.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

windowmanagerimp.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

windowmanagerimp.hpp

Removed non-essential includes from all MWGui header files.

2013-04-11 00:21:56 -04:00

windowpinnablebase.cpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00

windowpinnablebase.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

2013-04-10 14:46:21 -04:00