Merge remote-tracking branch 'zini/master' into animation2

CMakeLists.txt

@@ -658,6 +658,7 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/omwlauncher" DESTINATION "${BINDIR}" )
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/esmtool" DESTINATION "${BINDIR}" )
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/mwiniimport" DESTINATION "${BINDIR}" )
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/opencs" DESTINATION "${BINDIR}" )
 
     # Install icon and .desktop
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/apps/launcher/resources/images/openmw.png" DESTINATION "${ICONDIR}")

apps/openmw/engine.cpp

@@ -342,7 +342,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     //Load translation data
     mTranslationDataStorage.setEncoder(mEncoder);
-    mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[0]);
+    for (size_t i = 0; i < mMaster.size(); i++)
+      mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]);
 
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);

components/bsa/bsa_file.cpp

@@ -23,9 +23,7 @@
 
 #include "bsa_file.hpp"
 
-//#include <stdexcept>
-//#include <cstdlib>
-//#include <cassert>
+#include <stdexcept>
 
 #include "../files/constrainedfiledatastream.hpp"
 

components/nif/nif_file.cpp

@@ -37,7 +37,7 @@
 
 //TODO: when threading is needed, enable these
 //#include <boost/mutex.hpp>
-//#include <boost/thread/locks.hpp>
+#include <boost/thread/locks.hpp>
 
 namespace Nif
 {

credits.txt

@@ -16,6 +16,7 @@ Alexander Olofsson (Ace)
 Artem Kotsynyak (greye)
 athile
 BrotherBrick
+Chris Robinson
 Cory F. Cohen (cfcohen)
 Cris Mihalache (Mirceam)
 Douglas Diniz (Dgdiniz)