scrawl 495aeb5d3b Merge branch 'master' into HEAD ...

Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp

2013-06-12 12:34:33 +02:00

..

alchemywindow.cpp

Added new game button

2013-05-15 17:54:18 +02:00

alchemywindow.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

birth.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

birth.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

bookpage.cpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

bookpage.hpp

Dialogue history rewrite WIP

2013-05-04 14:15:47 +02:00

bookwindow.cpp

Fix image buttons

2013-05-08 13:55:15 +02:00

bookwindow.hpp

Fix image buttons

2013-05-08 13:55:15 +02:00

charactercreation.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

charactercreation.hpp

Removed non-essential includes from all MWGui header files.

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

class.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

class.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

companionitemmodel.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

companionitemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

companionwindow.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

companionwindow.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

confirmationdialog.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

confirmationdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

console.cpp

Console Object Selection Fix

2013-05-24 09:31:56 -04: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

Security skill

2013-05-19 18:40:37 +02:00

container.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

containeritemmodel.cpp

Sell owned items in the cell

2013-05-27 02:18:36 +02:00

containeritemmodel.hpp

Sell owned items in the cell

2013-05-27 02:18:36 +02:00

countdialog.cpp

Bug 752, spacing fix

2013-05-16 14:05:22 -04:00

countdialog.hpp

Bug 752, spacing fix

2013-05-16 14:05:22 -04:00

cursor.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

cursor.hpp

Removed non-essential includes from all MWGui header files.

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

dialogue.cpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

dialogue.hpp

Topic link fixes for russian version, thanks to greye for testing

2013-05-06 13:13:14 +02:00

enchantingdialog.cpp

Removal of duplicit enumeration and unnecessary conditions.

2013-05-29 00:01:18 +02: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

fontloader.cpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

fontloader.hpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

formatting.cpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

formatting.hpp

Fixes Bug #734 'Book empty line problem'

2013-05-02 07:35:25 +04:00

hud.cpp

Container UI rewrite

2013-05-11 18:38:27 +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

inventoryitemmodel.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

inventoryitemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

inventorywindow.cpp

Added new game button

2013-05-15 17:54:18 +02:00

inventorywindow.hpp

Added new game button

2013-05-15 17:54:18 +02:00

itemmodel.cpp

Sell owned items in the cell

2013-05-27 02:18:36 +02:00

itemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

itemselection.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

itemselection.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

itemview.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

itemview.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

journalbooks.cpp

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

journalbooks.hpp

Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries

2013-05-01 10:28:59 +02:00

journalviewmodel.cpp

rename IInterface to Interface

2013-05-06 16:05:56 +02:00

journalviewmodel.hpp

Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries

2013-05-01 10:28:59 +02:00

journalwindow.cpp

Bugfix #778

2013-05-16 13:35:28 +02:00

journalwindow.hpp

dropped the I infront of the journal view model interfaces

2013-04-24 21:53:25 -07:00

keywordsearch.cpp

Dialogue history rewrite WIP

2013-05-04 14:15:47 +02:00

keywordsearch.hpp

Handle @# links in journal

2013-05-06 15:14:39 +02:00

levelupdialog.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

levelupdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

list.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

list.hpp

Removed non-essential includes from all MWGui header files.

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

loadingscreen.cpp

Initialize values

2013-05-02 22:43: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 new game button

2013-05-15 17:54:18 +02:00

mainmenu.hpp

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

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

mapwindow.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

mapwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

merchantrepair.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

merchantrepair.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

messagebox.cpp

Bugfix #732 part 1

2013-05-03 12:44:27 +02:00

messagebox.hpp

Bugfix #732 part 1

2013-05-03 12:44:27 +02:00

mode.hpp

Companion UI

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

pickpocketitemmodel.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

pickpocketitemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

quickkeysmenu.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

quickkeysmenu.hpp

Removed non-essential includes from all MWGui header files.

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

race.cpp

Fixed race.cpp

2013-04-17 19:38:13 -04:00

race.hpp

Move away from fixed record names for body parts

2013-04-18 00:19:34 +02:00

referenceinterface.cpp

Fix activation not working sometimes

2013-04-21 21:24: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

No more using namespace

2013-04-17 18:56:48 -04:00

review.hpp

Removed non-essential includes from all MWGui header files.

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

scrollwindow.cpp

Fix image buttons

2013-05-08 13:55:15 +02:00

scrollwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

settingswindow.cpp

Bugfix #732 part 1

2013-05-03 12:44:27 +02:00

settingswindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

sortfilteritemmodel.cpp

Fix weapons not appearing in Enchantable filter

2013-05-28 03:15:13 +02:00

sortfilteritemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

soulgemdialog.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04: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

Container UI rewrite

2013-05-11 18:38:27 +02:00

spellbuyingwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

spellcreationdialog.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

spellcreationdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

spellicons.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

spellicons.hpp

Magic effect icons for spells

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

spellwindow.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

spellwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

statswindow.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

statswindow.hpp

Removed non-essential includes from all MWGui header files.

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

textinput.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

textinput.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

tooltips.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

tooltips.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

tradeitemmodel.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

tradeitemmodel.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

tradewindow.cpp

Sell owned items in the cell

2013-05-27 02:18:36 +02:00

tradewindow.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

trainingwindow.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

trainingwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

travelwindow.cpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

travelwindow.hpp

Removed non-essential includes from all MWGui header files.

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

waitdialog.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

waitdialog.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

widgets.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

widgets.hpp

Removed non-essential includes from all MWGui header files.

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

windowbase.cpp

Cleaned up includes in implementation files

2013-04-16 20:16:22 -04:00

windowbase.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

windowmanagerimp.cpp

Merge branch 'master' into HEAD

2013-06-12 12:34:33 +02:00

windowmanagerimp.hpp

Merge branch 'master' into HEAD

2013-06-12 12:34:33 +02:00

windowpinnablebase.cpp

No more using namespace

2013-04-17 18:56:48 -04:00

windowpinnablebase.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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