You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/apps/esmtool
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
..
.gitignore Moved esmtool to apps/ 15 years ago
CMakeLists.txt We don't need Carbon on OS X anymore 12 years ago
esmtool.cpp Merge branch 'refnum' into savedgame 11 years ago
labels.cpp Closes #1086: Implement blood effects 11 years ago
labels.hpp Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 11 years ago
record.cpp Fix some typos and accidental commit 11 years ago
record.hpp Various fixes for CppCheck warnings. 11 years ago