scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD ...

Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp

2015-11-13 01:34:36 +01:00

..

.gitignore

Moved esmtool to apps/

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

CMakeLists.txt

Refactor cmake scripts, reducing the amount of find_package(Boost)

2015-06-12 01:45:19 +02:00

esmtool.cpp

Load methods (for ESM records) accept a deleted flag in ESMTool

2015-07-22 22:17:49 +03:00

labels.cpp

Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.

2015-06-13 14:37:47 +10:00

labels.hpp

Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.

2014-01-14 07:42:03 +01:00

record.cpp

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00

record.hpp

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00