6 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	79706bf60f	Issue #219: dialogue manager cleanup	2012-11-10 14:31:58 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
Marc Zinnschlag	a84145a087	Issue #107: minor corrections	2012-08-09 12:05:47 +02:00
Marc Zinnschlag	923109b260	Issue #107: DialogueManager is accessed only through the interface class from now on	2012-08-09 10:35:53 +02:00