gugus 0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ...

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/player.cpp
	apps/openmw/mwworld/player.hpp

2012-04-09 14:43:35 +02:00

..

dialoguemanager.cpp

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

2012-04-09 14:43:35 +02:00

dialoguemanager.hpp

check playerfaction during dialogue

2012-04-04 22:13:57 +02:00

journal.cpp

Merge remote branch 'werdanith/journalmessage'

2012-03-19 19:34:28 +01:00

journal.hpp

added topic tracking

2011-04-26 20:48:36 +02:00

journalentry.cpp

accessing topic index didn't work

2011-12-29 17:32:57 +01:00

journalentry.hpp

added quest tracking to the journal

2011-04-26 20:08:37 +02:00

quest.cpp

splitting of topic class from quest class

2011-04-26 20:39:59 +02:00

quest.hpp

splitting of topic class from quest class

2011-04-26 20:39:59 +02:00

topic.cpp

splitting of topic class from quest class

2011-04-26 20:39:59 +02:00

topic.hpp

splitting of topic class from quest class

2011-04-26 20:39:59 +02:00