mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 12:45:33 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Chris Robinson 2013-02-22 01:34:22 -08:00
commit 3c0b29de45
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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}/omwlauncher" DESTINATION "${BINDIR}" )
INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/esmtool" DESTINATION "${BINDIR}" ) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/esmtool" DESTINATION "${BINDIR}" )
INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/mwiniimport" DESTINATION "${BINDIR}" ) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/mwiniimport" DESTINATION "${BINDIR}" )
INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/opencs" DESTINATION "${BINDIR}" )
# Install icon and .desktop # Install icon and .desktop
INSTALL(FILES "${OpenMW_SOURCE_DIR}/apps/launcher/resources/images/openmw.png" DESTINATION "${ICONDIR}") INSTALL(FILES "${OpenMW_SOURCE_DIR}/apps/launcher/resources/images/openmw.png" DESTINATION "${ICONDIR}")

3
apps/openmw/engine.cpp
View file

@ -342,7 +342,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
//Load translation data //Load translation data
mTranslationDataStorage.setEncoder(mEncoder); 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 // Create window manager - this manages all the MW-specific GUI windows
MWScript::registerExtensions (mExtensions); MWScript::registerExtensions (mExtensions);

4
components/bsa/bsa_file.cpp
View file

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

2
components/nif/nif_file.cpp
View file

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

1
credits.txt
View file

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