scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics ...

Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout

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

..

alchemywindow.cpp

Issue #492: fixed double alchemy ingredients removal

2012-12-02 15:07:22 +01:00

alchemywindow.hpp

fix some alchemy issues and make the gui use the new implementation

2012-10-18 22:21:39 +02:00

birth.cpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

birth.hpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

bookwindow.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

bookwindow.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

charactercreation.cpp

fix gender selection update, main model visibility and couple of crashes

2012-11-10 19:57:50 +04:00

charactercreation.hpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

class.cpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

class.hpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

confirmationdialog.cpp

replaced everything with the new method

2012-09-10 13:39:22 +02:00

confirmationdialog.hpp

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

console.cpp

disable createRecord(), Land constness hack, various fixes with Store<T> interface

2012-11-06 13:14:03 +04:00

console.hpp

Issue #352: added --script-run switch

2012-07-30 12:37:46 +02:00

container.cpp

fix for http://bugs.openmw.org/issues/517

2013-01-02 18:58:52 +04:00

container.hpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

countdialog.cpp

Task #400 Review GMST access

2012-09-22 21:35:57 +02:00

countdialog.hpp

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

cursor.cpp

Oops, rotation center should be dynamic

2013-03-01 22:32:02 +01:00

cursor.hpp

Got rid of the texture rotation hack by rendering the cursor manually.

2013-03-01 18:45:52 +01:00

dialogue_history.cpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

dialogue_history.hpp

fixed some "using namespace" in headers

2012-09-10 09:10:50 +02:00

dialogue.cpp

DialogueWindow: do not execute onFrame() when not visible

2013-01-15 00:59:48 +01:00

dialogue.hpp

Merge branch 'master' of git://github.com/zinnschlag/openmw

2013-01-01 22:18:21 +04:00

enchantingdialog.cpp

abstracted code and use it in enchanting window as well

2012-10-03 15:36:10 +02:00

enchantingdialog.hpp

abstracted code and use it in enchanting window as well

2012-10-03 15:36:10 +02:00

exposedwindow.cpp

Make the "lock window" button to change state visually

2013-02-20 01:30:39 +01:00

exposedwindow.hpp

Make the "lock window" button to change state visually

2013-02-20 01:30:39 +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

allowed dropObjectOnGround to be used on npcs, not just player

2013-01-09 18:53:14 +00:00

hud.hpp

finished?

2012-09-15 17:12:42 +02: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 menu/journal/book/scroll buttons when using localised MW-installations

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

inventorywindow.cpp

refactored special variable code

2013-02-03 13:27:27 +00:00

inventorywindow.hpp

race selection/inventory preview character model update

2012-11-10 11:41:12 +04:00

itemselection.cpp

replaced everything with the new method

2012-09-10 13:39:22 +02:00

itemselection.hpp

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

journalwindow.cpp

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

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

journalwindow.hpp

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

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

levelupdialog.cpp

clean up interfaces

2012-11-08 16:37:57 +04:00

levelupdialog.hpp

finished?

2012-09-15 17:12:42 +02:00

list.cpp

edit effect dialog

2012-09-24 08:09:16 +02:00

list.hpp

edit effect dialog

2012-09-24 08:09:16 +02:00

loadingscreen.cpp

Removed the 3 dots after the load text.

2013-02-28 19:25:18 +01:00

loadingscreen.hpp

Supply the new render window to mygui

2013-02-05 20:48:25 +01: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

map_window.cpp

Workaround to prevent the map drawing on top of the world button

2013-02-28 21:12:13 +01:00

map_window.hpp

Workaround to prevent the map drawing on top of the world button

2013-02-28 21:12:13 +01:00

messagebox.cpp

Added click sound to OK button for message boxes

2013-02-26 16:37:59 +01:00

messagebox.hpp

pressing enter when a messagebox is prompting for "ok", will activate ok button

2013-02-10 14:58:46 +00:00

mode.hpp

Merge branch 'master' into videoplayback

2012-12-01 11:30:51 +01:00

quickkeysmenu.cpp

Issue #479: Added additional magnitude parameter to known spells

2013-01-12 13:10:20 +01:00

quickkeysmenu.hpp

fix screenshot function

2012-08-27 15:51:01 +02:00

race.cpp

Use the correct GMST for the race menu

2013-02-25 13:04:17 -08:00

race.hpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

referenceinterface.cpp

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

2012-07-07 01:14:18 +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

review.cpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

review.hpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

scrollwindow.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

scrollwindow.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

settingswindow.cpp

Water shader no longer depends on object shaders being enabled

2013-02-24 10:28:50 +01:00

settingswindow.hpp

Refraction can be disabled separately now

2013-02-05 14:29:46 +01:00

spellbuyingwindow.cpp

Issue #479: Added additional magnitude parameter to known spells

2013-01-12 13:10:20 +01:00

spellbuyingwindow.hpp

and go

2012-09-23 00:36:20 +02:00

spellcreationdialog.cpp

Issue #479: Added additional magnitude parameter to known spells

2013-01-12 13:10:20 +01:00

spellcreationdialog.hpp

finished spell creation

2012-10-23 11:42:38 +02:00

spellwindow.cpp

Issue #479: Added additional magnitude parameter to known spells

2013-01-12 13:10:20 +01:00

spellwindow.hpp

Issue #107: WindowManager is accessed only through the interface class from now on

2012-08-12 18:11:09 +02:00

stats_window.cpp

PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank

2012-11-28 02:15:34 +01:00

stats_window.hpp

PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank

2012-11-28 02:15:34 +01:00

text_input.cpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

text_input.hpp

Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)

2013-02-25 06:57:32 +01:00

tooltips.cpp

Factored faced object lookups into MWRender::World

2013-01-07 23:38:08 -08:00

tooltips.hpp

Fix window formatting on tool tip with too log titles

2012-12-02 14:08:22 +01:00

tradewindow.cpp

TradeWindow: fixed coding style

2013-02-23 13:51:21 +01:00

tradewindow.hpp

TradeWindow: fixed coding style

2013-02-23 13:51:21 +01:00

trainingwindow.cpp

method names, disposition uint->int

2012-11-09 14:42:09 +01:00

trainingwindow.hpp

training window

2012-10-17 18:03:02 +02:00

travelwindow.cpp

Fix travel services not actually costing gold.

2013-02-17 18:30:21 +01:00

travelwindow.hpp

traveling.

2012-10-08 11:14:22 +02:00

waitdialog.cpp

Replaced ifs/elseifs with switch

2013-02-26 19:52:51 +01:00

waitdialog.hpp

Implement "Rest Until Healed"

2013-02-16 13:35:03 -05:00

widgets.cpp

Ingredient effects now correctly hide until the player has discovered them

2013-01-11 01:23:24 +01:00

widgets.hpp

Ingredient effects now correctly hide until the player has discovered them

2013-01-11 01:23:24 +01:00

window_base.cpp

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

window_base.hpp

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

window_pinnable_base.cpp

Remove "PinToggle" event from layout file

2013-02-20 01:31:10 +01:00

window_pinnable_base.hpp

Remove "PinToggle" event from layout file

2013-02-20 01:31:10 +01:00

windowmanagerimp.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

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

windowmanagerimp.hpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

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