mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling

Browse source
This commit is contained in:
gugus 2012-06-15 14:53:58 +02:00
commit 974585d357
7 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -370,6 +370,10 @@ if(WIN32)
INSTALL(FILES INSTALL(FILES
"${OpenMW_BINARY_DIR}/plugins.cfg" "${OpenMW_BINARY_DIR}/plugins.cfg"
"${OpenMW_SOURCE_DIR}/readme.txt" "${OpenMW_SOURCE_DIR}/readme.txt"
"${OpenMW_SOURCE_DIR}/GPL3.txt"
"${OpenMW_SOURCE_DIR}/OFL.txt"
"${OpenMW_SOURCE_DIR}/Bitstream Vera License.txt"
"${OpenMW_SOURCE_DIR}/Daedric Font License.txt"
"${OpenMW_BINARY_DIR}/launcher.qss" "${OpenMW_BINARY_DIR}/launcher.qss"
"${OpenMW_BINARY_DIR}/settings-default.cfg" "${OpenMW_BINARY_DIR}/settings-default.cfg"
"${OpenMW_BINARY_DIR}/transparency-overrides.cfg" "${OpenMW_BINARY_DIR}/transparency-overrides.cfg"
@ -391,8 +395,8 @@ if(WIN32)
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Readme.lnk\\\" Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Readme.lnk\\\"
") ")
SET(CPACK_RESOURCE_FILE_README "${OpenMW_SOURCE_DIR}/readme.txt")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenMW_SOURCE_DIR}/readme.txt") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenMW_SOURCE_DIR}/readme.txt")
SET(CPACK_RESOURCE_FILE_LICENSE "${OpenMW_SOURCE_DIR}/GPL3.txt")
SET(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") SET(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
SET(CPACK_NSIS_DISPLAY_NAME "OpenMW") SET(CPACK_NSIS_DISPLAY_NAME "OpenMW")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org") SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org")

8
apps/openmw/mwgui/settingswindow.hpp
View file

@ -16,10 +16,10 @@ namespace MWGui
SettingsWindow(WindowManager& parWindowManager); SettingsWindow(WindowManager& parWindowManager);
private: private:
static const float sFovMin = 30; static int const sFovMin = 30;
static const float sFovMax = 140; static int const sFovMax = 140;
static const float sViewDistMin = 2000; static int const sViewDistMin = 2000;
static const float sViewDistMax = 5600; static int const sViewDistMax = 5600;
protected: protected:
MyGUI::Button* mOkButton; MyGUI::Button* mOkButton;

4
apps/openmw/mwsound/audiere_decoder.cpp
View file

@ -41,8 +41,8 @@ class OgreFile : public audiere::File
} }
size_t refs; size_t refs;
virtual void ref() { ++refs; } ADR_METHOD(void) ref() { ++refs; }
virtual void unref() ADR_METHOD(void) unref()
{ {
if(--refs == 0) if(--refs == 0)
delete this; delete this;

2
cmake/FindBullet.cmake
View file

@ -19,6 +19,8 @@
# BSD license. # BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
set(BULLET_ROOT $ENV{BULLET_ROOT})
macro(_FIND_BULLET_LIBRARY _var) macro(_FIND_BULLET_LIBRARY _var)
find_library(${_var} find_library(${_var}
NAMES NAMES

6
cmake/FindMyGUI.cmake
View file

@ -22,7 +22,7 @@ IF (WIN32) #Windows
SET(MYGUISDK $ENV{MYGUI_HOME}) SET(MYGUISDK $ENV{MYGUI_HOME})
IF (MYGUISDK) IF (MYGUISDK)
findpkg_begin ( "MYGUI" ) findpkg_begin ( "MYGUI" )
MESSAGE(STATUS "Using MyGUI in OGRE SDK") MESSAGE(STATUS "Using MyGUI in MyGUI SDK")
STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" ) STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
find_path ( MYGUI_INCLUDE_DIRS find_path ( MYGUI_INCLUDE_DIRS
@ -35,7 +35,7 @@ MyGUI_OgrePlatform.h
"${MYGUISDK}/Platforms/Ogre/OgrePlatform/include" "${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib ) SET ( MYGUI_LIB_DIR ${MYGUISDK}/lib ${MYGUISDK}/*/lib )
find_library ( MYGUI_LIBRARIES_REL NAMES find_library ( MYGUI_LIBRARIES_REL NAMES
MyGUIEngine.lib MyGUIEngine.lib
@ -69,7 +69,7 @@ make_library_set ( MYGUI_PLATFORM_LIBRARIES )
MESSAGE ("${MYGUI_LIBRARIES}") MESSAGE ("${MYGUI_LIBRARIES}")
MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}") MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
findpkg_finish ( "MYGUI" ) #findpkg_finish ( "MYGUI" )
ENDIF (MYGUISDK) ENDIF (MYGUISDK)
IF (OGRESOURCE) IF (OGRESOURCE)

10
libs/openengine/bullet/pmove.cpp
View file

@ -15,8 +15,6 @@ Quake 3 Arena is copyright (C) 1999-2005 Id Software, Inc.
//#include "GameTime.h" //#include "GameTime.h"
//#include "Object.h"
//#include "Sound.h" //#include "Sound.h"
//#include "..\..\ESMParser\ESMParser\SNDG.h" //#include "..\..\ESMParser\ESMParser\SNDG.h"
@ -68,7 +66,6 @@ static struct playermoveLocal
int waterHeight; int waterHeight;
bool hasWater; bool hasWater;
bool isInterior; bool isInterior;
//Object* traceObj;
} pml; } pml;
@ -1833,13 +1830,6 @@ void PmoveSingle (playerMove* const pmove)
pml.hasWater = pmove->hasWater; pml.hasWater = pmove->hasWater;
pml.isInterior = pmove->isInterior; pml.isInterior = pmove->isInterior;
pml.waterHeight = pmove->waterHeight; pml.waterHeight = pmove->waterHeight;
#ifdef _DEBUG
if (!pml.traceObj)
__debugbreak();
if (!pml.traceObj->incellptr)
__debugbreak();
#endif
// determine the time // determine the time
pml.msec = pmove->cmd.serverTime - pm->ps.commandTime; pml.msec = pmove->cmd.serverTime - pm->ps.commandTime;

1
libs/openengine/bullet/pmove.h
View file

@ -190,7 +190,6 @@ struct playerMove
int waterHeight; int waterHeight;
bool hasWater; bool hasWater;
bool isInterior; bool isInterior;
//Object* traceObj;
OEngine::Physic::PhysicEngine* mEngine; OEngine::Physic::PhysicEngine* mEngine;
}; };