Marc Zinnschlag 3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat' ...

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt

2014-01-13 10:17:10 +01:00

..

.gitignore

Moved esmtool to apps/

2010-07-21 13:52:28 +02:00

CMakeLists.txt

We don't need Carbon on OS X anymore

2013-06-15 14:47:33 +04:00

esmtool.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

labels.cpp

Remove unused magic effect flags and update esmtool output

2014-01-12 01:25:00 +01:00

labels.hpp

esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel

2013-02-16 14:48:44 +01:00

record.cpp

printAIPackage: changed field name from Unknown to ShouldRepeat too.

2014-01-07 04:58:59 +04:00

record.hpp

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00