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

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

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

bookpage.hpp

Dialogue history rewrite WIP

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

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

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

Forgot to apply the same fix to companion window

2013-11-16 23:55:54 +01: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

Another console fix: discard text markup when getting the command line's text

2014-01-04 05:24:32 +01:00

console.hpp

Fixes the console sometimes receiving text after it was closed

2013-07-14 23:54:28 +02:00

container.cpp

Fix an issue with items that have no UI icon

2013-12-26 20:53:51 +01:00

container.hpp

Container UI rewrite

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

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

Sell owned items in the cell

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

controllers.cpp

Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders

2013-07-06 16:40:57 +02:00

controllers.hpp

use a mygui controller for scrollbar repeat

2013-07-05 19:17:00 +02:00

countdialog.cpp

Allow the 'Activate' key to close the countdialog window; cleanups

2013-07-29 18:27:00 +02:00

countdialog.hpp

Allow the 'Activate' key to close the countdialog window; cleanups

2013-07-29 18:27:00 +02:00

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

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

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

enchantingdialog.cpp

Play sound when enchanting

2013-11-28 11:37:30 +01: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

Fixed polish font

2013-09-10 22:11:57 +02:00

fontloader.hpp

Use Morrowind's fonts

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

formatting.cpp

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

formatting.hpp

Fixes Bug #734 'Book empty line problem'

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

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

Container UI rewrite

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

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

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

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

itemselection.hpp

Container UI rewrite

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

itemview.cpp

Fix a container window regression (oops)

2013-11-15 02:57:21 +01: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

use Entry instead of plain string for topic and quest entries

2013-12-01 14:50:25 +01: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

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

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

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

levelupdialog.cpp

Change all instances of skill/attribute values to use an appropriate typedef.

2014-01-03 01:59:15 +01: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

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

Finally eliminated calls to MWBase::WindowManager in constructors

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

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

Container UI rewrite

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

quickkeysmenu.cpp

Issue #1029 - Quick keys menu: Select compatible replacement when tool used up

2013-12-27 00:51:29 +01:00

quickkeysmenu.hpp

Removed non-essential includes from all MWGui header files.

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

race.cpp

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

race.hpp

Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea

2013-07-06 17:02:40 +02:00

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

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

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

Allow specifying the sound type to playSound and playSound3D

2013-07-18 21:50:11 -07:00

scrollwindow.hpp

Finally eliminated calls to MWBase::WindowManager in constructors

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

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

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

Implement magic item recharging via soulgem use

2013-11-19 06:48:47 +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

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

Finally eliminated calls to MWBase::WindowManager in constructors

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

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

Spell cost is updatedon every change in enchanting and spellmaking.

2013-07-31 13:33:30 +02:00

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

Finally eliminated calls to MWBase::WindowManager in constructors

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

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

Enable SDL_TEXTINPUT events only when a text input widget currently has key focus

2013-06-16 18:06:55 +02:00

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

Change tooltip positioning to resemble vanilla

2013-07-10 03:40:13 +02:00

tradeitemmodel.cpp

Some checks to prevent bound item abuse

2014-01-02 01:36:08 +01:00

tradeitemmodel.hpp

Container UI rewrite

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

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

Finally eliminated calls to MWBase::WindowManager in constructors

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

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

Removed non-essential includes from all MWGui header files.

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

waitdialog.cpp

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

waitdialog.hpp

autorepeat scrollbar

2013-07-02 17:29:47 +02:00

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

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

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

Saner inventory window pinning/hiding

2013-08-07 23:30:08 +02:00

windowpinnablebase.hpp

Saner inventory window pinning/hiding

2013-08-07 23:30:08 +02:00