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

..

mwbase

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

mwclass

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

mwdialogue

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

mwgui

Merge remote-tracking branch 'scrawl/persuasion' into next

2012-11-10 14:59:52 +01:00

mwinput

changed OIS includes since OIS_INCLUDE_DIR is already an include directory

2012-11-06 15:26:51 +01:00

mwmechanics

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

mwrender

minor fix

2012-11-10 15:11:21 +01:00

mwscript

Issue #219: dialogue manager cleanup

2012-11-10 14:31:58 +01:00

mwsound

applying new interface vol.3, inconsistent

2012-11-05 21:45:35 +04:00

mwworld

update main character model

2012-11-10 11:51:48 +04:00

CMakeLists.txt

Issue #219: added basic select struct analysis and type checking

2012-11-08 16:49:38 +01:00

config.hpp.cmake

another minor correction (fixing the previous one)

2011-07-08 16:16:06 +02:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

Issue #219: dialogue manager cleanup

2012-11-10 14:31:58 +01:00

engine.hpp

Issue #352: added --script-run switch

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

main.cpp

disabling gcc extensions

2012-10-09 17:10:25 +02:00