scrawl b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw ...

Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp

2014-05-23 08:39:48 +02:00

..

dialoguemanagerimp.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

dialoguemanagerimp.hpp

Fixes #1172: Added basic loading/saving progress bar

2014-04-28 11:29:57 +02:00

filter.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw

2014-05-23 08:39:48 +02:00

filter.hpp

Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group

2014-05-18 06:52:15 +02:00

journalentry.cpp

Dialogue merging

2014-05-18 15:25:16 +02:00

journalentry.hpp

Feature #764: Store the actor that gave the dialog response

2014-02-01 18:42:01 +01:00

journalimp.cpp

Dialogue merging

2014-05-18 15:25:16 +02:00

journalimp.hpp

Fixes #1172: Added basic loading/saving progress bar

2014-04-28 11:29:57 +02:00

quest.cpp

Dialogue merging

2014-05-18 15:25:16 +02:00

quest.hpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

selectwrapper.cpp

Dialog function 72 is not player-specific

2013-08-08 06:02:16 -07:00

selectwrapper.hpp

Dialog function 72 is not player-specific

2013-08-08 06:02:16 -07:00

topic.cpp

Don't add duplicate topic responses to the journal

2014-02-01 18:42:00 +01:00

topic.hpp

storing and loading the journal

2013-12-03 14:28:46 +01:00