mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 17:49:55 +00:00
Code Issues Releases Wiki Activity
25348 commits 38 branches 54 tags 122 MiB
Commit graph

927 commits

Author SHA1 Message Date
Arthur Moore
2a653e45fd (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
 2015-07-28 06:51:47 -04:00
Marc Zinnschlag
4fa2cd288d Merge branch 'openmw-36' 
Conflicts:
	apps/openmw/mwworld/store.hpp
 2015-07-18 12:47:05 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
slothlife
83ef1f7eea Add support for linking OpenSceneGraph statically 
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
 2015-07-17 00:56:15 -05:00
scrawl
cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 2015-06-28 05:53:03 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
Alexander "Ace" Olofsson
cd42448cd6 Windows build fixes and CMakeLists cleanup 
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
 2015-06-08 15:41:39 +02:00
scrawl
d9a00288f8 Make install fix 2015-06-08 01:58:12 +02:00
scrawl
58917bcca6 Minor cleanup 2015-06-04 01:24:29 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
b0b55e2037 Delete niftest as it's currently broken 2015-06-01 02:48:15 +02:00
Marc Zinnschlag
d05d7f51d9 increased version number 2015-05-31 14:20:13 +02:00
scrawl
62ce2cc123 Minor cleanup 2015-05-30 20:44:19 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
scrawl
f2809ab63b Delete nifosgtest again 2015-05-23 06:53:26 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
fe15f31f3e Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
Marc Zinnschlag
9f6bc1b3a9 increased version number 2015-05-04 19:06:02 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
157d8bfedd Remove unused mygui files 2015-05-03 17:26:12 +02:00
k1ll
fe03727ae5 Don't force linking static boost libraries when building with mingw 2015-04-29 18:31:30 +02:00
scrawl
48a6d7c1a0 Remove mygui platform libraries from cmake 2015-04-28 16:33:30 +02:00
scrawl
8410966753 Disable mygui plugin for now 2015-04-22 18:01:55 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
scrawl
e6cf959134 Revert "Delete nifosgtest" 
This reverts commit ba3075dc11.
 2015-04-11 14:46:52 +02:00
scrawl
ba3075dc11 Delete nifosgtest 2015-04-02 16:28:16 +02:00
Scott Howard
d646836cdd turn on -Wno-potentially-evaluated-expression on clang 2015-04-01 22:09:20 -04:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
12f27123f2 Billboard scaling fix and culling bug fix 2015-03-30 17:11:27 +02:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
Scott Howard
d7baf92353 tell include_directories which libraries are system libs 2015-03-09 16:49:40 -04:00
Scott Howard
88f746574d fix compiler detection and adding build flags in CMakeLists.txt 2015-03-09 14:37:43 -04:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
Marc Zinnschlag
cdf53c17e7 updated version number 2015-03-03 11:54:35 +01:00
scrawl
1eaa64c49c CMake: remove lines for MinGW, no one is maintaining those 2015-03-02 15:45:44 +01:00
scrawl
c6aa374934 CMake: set windows warning levels globally instead of per target 2015-03-02 15:45:29 +01:00
scrawl
c57f9ad5dc CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None 2015-03-02 15:44:27 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
8d64f2081e Add particle system state loading 2015-02-24 01:25:31 +01:00
scrawl
8e01d8cb19 Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
scrawl
8c10d4badb NIF reader compiles without Ogre 2015-02-17 17:08:55 +01:00
scrawl
d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 2015-02-17 16:19:21 +01:00
scrawl
1124343e0d Add BUILD_OPENMW switch, build will be broken in next commit 2015-02-17 16:05:28 +01:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
Marc Zinnschlag
6cc9fa2b3f Merge remote-tracking branch 'slothlife/cmake-release-build-fix' 2015-02-15 09:52:13 +01:00
slothlife
f1fd27aeaf Select CMAKE_BUILD_TYPE if not specified 
A suggestion by kcat to ensure CMake selects a reasonable default for
the build type if users don't set it themselves.
 2015-02-14 23:34:43 -06:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
Marc Zinnschlag
003d0610f4 Merge remote-tracking branch 'ace/link-time-optimzation' 2015-02-10 10:50:45 +01:00
Alexander "Ace" Olofsson
9da0a9f8c4 Enable link-time optimization on MSVC 2015-02-10 00:55:31 +01:00
scrawl
399c24c646 CMake cleanup: remove redundant setting of Permissions to default values 2015-02-09 20:16:29 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
c63ab673e1 Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 
This reverts commit 94002b0758.

Conflicts:
	CMakeLists.txt
 2015-02-07 23:24:27 +01:00
Rosanne DiMesio
28eb766bba Respect LIB_SUFFIX 2015-02-06 14:27:12 -06:00
Nikolay Kasyanov
5534306eb3 Few rename fixes 2015-02-06 08:59:00 +02:00
Alexander "Ace" Olofsson
abb334bc1e Missing change for the tool rename 2015-02-03 22:43:15 +01:00
Marc Zinnschlag
c02537c3b1 incremented version number 2015-02-03 13:42:47 +01:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
8e5c8aa562 Add support for passing in Ogre plugin directory via CMake 2015-01-23 23:57:00 +01:00
Marc Zinnschlag
f4bf2aa412 Merge remote-tracking branch 'origin/master' 2015-01-20 16:07:17 +01:00
Alexander "Ace" Olofsson
ebe2e1491a Fix broken windows builds due to README change 2015-01-20 15:24:33 +01:00
scrawl
031eec4550 Starting ESS importer for Morrowind save files 2015-01-17 00:16:49 +01:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 2015-01-09 20:53:43 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files 
This allows us to launch OpenMW when the user opens a save game file through the file manager.
 2015-01-07 15:08:57 +01:00
Arthur Moore
c1315ed90c Build the nif file tester by default 
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
 2015-01-01 22:49:33 -05:00
Marco Schulze
3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout 
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
 2014-12-30 18:37:33 -03:00
Marco Schulze
d92cd2ffad Remove GetGitRevisionDescription.cmake 
GetGitRevisionDescription.cmake uses a somewhat contrived method to obtain the
hash of the commit pointed by the repository's HEAD. This method fails on
unusual, but still valid repository layouts.

This commit removes cmake/GetGitRevisionDescription.cmake{,.in}, replacing its
functionality with direct use of Git's plumbing.
 2014-12-27 00:26:35 -03:00
Marc Zinnschlag
d67ad9037e increased version number 2014-12-03 20:55:33 +01:00
scrawl
a8a2b44b0f Don't require libunshield on windows 2014-11-23 00:51:57 +01:00
scrawl
d4a9cf7075 Fix wizard install location 2014-11-18 17:54:37 +01:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 2014-11-18 17:43:51 +01:00
Marc Zinnschlag
45d41e22e2 Merge branch 'openmw-33' 2014-11-05 21:22:18 +01:00
Marc Zinnschlag
5909fa4368 new version number and updated changelog 2014-11-05 21:18:43 +01:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 2014-10-22 22:33:32 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +02:00
Marc Zinnschlag
86f5073293 increased version number 2014-10-15 09:12:34 +02:00
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
vocollapse
772c66eedf Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen. 2014-10-12 18:30:39 +02:00
cc9cii
f459adf117 Revert CMake changes (didn't work for osx anyway) 2014-10-12 22:30:08 +11:00
cc9cii
971b0de4fa An attempt to make osx to find the ogre overlay headers. 2014-10-12 21:48:49 +11:00
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11:00
vocollapse
71f3f71f78 added make target for doxygen: make doc, make doc_pages 2014-10-12 11:28:56 +02:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
scrawl
62ea913e69 Fix cmake warning 2014-09-24 20:09:48 +02:00
Marc Zinnschlag
147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 2014-09-23 08:57:49 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00
eroen
0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 2014-09-22 15:36:42 +02:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00
scrawl
b1e74e2a85 Remove support for Ogre 1.8 versions 2014-09-21 10:41:13 +02:00
Sebastian Wick
f46da271d7 SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr" 2014-09-19 07:13:06 +02:00
Sebastian Wick
2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 2014-09-19 03:15:28 +02:00
Stanislav
313bdf4e78 fix 2014-09-18 10:25:33 +06:00
Stanislav
76f2e5d5b8 CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build. 2014-09-17 09:05:47 +06:00
Marc Zinnschlag
3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 2014-09-15 12:44:38 +02:00
cc9cii
d92400e550 Remove libavresample restriction. 2014-09-15 19:46:11 +10:00
cc9cii
166ee6b483 Do not use cached FFMPEG_LIBRARIES. Make error messages clearer. 2014-09-15 18:49:07 +10:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
9d05718515 Move plugin to new plugins/ top level directory 2014-09-12 19:27:49 +02:00
Marc Zinnschlag
f142d82b3a Merge remote-tracking branch 'ace/win-package-fix' 2014-09-12 14:28:46 +02:00
Marc Zinnschlag
2397a87330 Merge remote-tracking branch 'scrawl/bsatool' 2014-09-12 14:27:00 +02:00
Alexander "Ace" Olofsson
dd3d7ba474 Update NSIS to use the new icon path 2014-09-12 04:32:53 +02:00
scrawl
ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 2014-09-11 23:33:54 +02:00
scrawl
1bb9359b4c Fix a typo 2014-09-11 21:52:57 +02:00
scrawl
fca8dc9674 Enable bsatool build by default 2014-09-11 21:48:24 +02:00
cc9cii
862c5fc8f6 Add libavresample support. Tested on windows x64 only. 2014-09-11 16:47:00 +10:00
cc9cii
785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 2014-09-08 15:24:39 +10:00
cc9cii
c6cad5adc5 Make cmake more reliably detect libswresample 2014-09-04 18:55:10 +10:00
cc9cii
f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 2014-09-01 21:49:37 +10:00
cc9cii
944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 2014-08-31 13:20:33 +10:00
Marc Zinnschlag
b6a3541573 increased version number 2014-08-29 10:03:49 +02:00
scrawl
17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 2014-08-26 17:01:35 +02:00
Arthur Moore
53ce94d0e4 Disable building nif file tester by default 2014-08-24 12:11:46 -04:00
Arthur Moore
cdfa24e15d (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 
Just give it a set of files, one file per argument, and it will make sure openmw can read them.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
 2014-08-24 12:09:39 -04:00
scrawl
77a4e38c49 Remove -Wno-ignored-qualifiers and fix caused warnings 2014-08-14 19:18:30 +02:00
Marc Zinnschlag
f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 2014-08-06 08:04:11 +02:00
root
713787d92f fix v7 2014-08-06 07:48:16 +04:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
16aafc26bc fixed cmake for build on all plaforms include android 2014-08-04 19:49:54 +04:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
bogglez
b56cb7e5ee Remove defunct option for building without FFmpeg 
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
  (FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
 2014-07-28 17:46:41 +02:00
scrawl
192d5ca08f Allow overriding OGRE_PLUGIN_DIR in cmake command line 2014-07-17 22:31:57 +02:00
Marc Zinnschlag
7316f4dde4 increased version number 2014-07-12 18:53:22 +02:00
slothlife
96ba4a414f Fix MSVC size_t conversion warning. 2014-06-24 00:13:34 -05:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
Alexander "Ace" Olofsson
5960d3f1d9 These files moved, leading to package failure 2014-06-14 13:54:12 +02:00
scrawl
7eee0855f7 Merge commit 'pull/origin/155' 
Conflicts:
	CMakeLists.txt
 2014-06-10 23:24:16 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-06-10 19:32:49 +02:00
scrawl
3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 2014-06-10 15:03:27 +02:00
Bret Curtis
e28888df39 fix for dejavu location 2014-06-10 14:51:51 +02:00
Bret Curtis
8419002393 Task #940: Move licenses to appropriate place in docs. Additional cleanup. 2014-06-10 11:25:39 +02:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
slothlife
20dabaead9 Fix CMake scripts to link static dependencies 
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
 2014-06-02 02:51:04 -05:00
scrawl
5df9ff8e2c Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg 
Fixes installing to /usr/local (Bug #1378)
 2014-06-01 23:32:05 +02:00
pvdk
5af12d193a Cleaned up old wizard stuff from launcher 2014-05-29 17:57:41 +02:00
pvdk
38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 2014-05-29 16:42:16 +02:00
Marc Zinnschlag
244eb11651 Merge remote-tracking branch 'greye/widechar' 2014-05-23 07:48:26 +02:00
greye
8f9091550e require boost::locale only on Windows 2014-05-22 15:42:47 +04:00
scrawl
2f6d400c62 Merge branch 'master' of https://github.com/OpenMW/openmw into newgame 2014-05-21 10:41:03 +02:00
greye
b728a919a2 write dependency on boost::locale to CMake files 2014-05-20 12:59:58 +04:00
greye
46c32f6c47 OpenEngine MyGUI logging facility 2014-05-20 10:37:04 +04:00
scrawl
510b7f8505 Task #1333: Remove cmake git tag reading 2014-05-19 07:31:19 +02:00
Marc Zinnschlag
7c149e98e0 Merge branch 'openmw-30' 2014-05-18 22:38:52 +02:00
Marc Zinnschlag
a5f0fe7282 incremented version number 2014-05-18 20:07:41 +02:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
 2014-05-15 08:13:15 +02:00
slothlife
f33559fead Fixes for MSVC warnings, less overall changes 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
 2014-05-14 20:12:52 -05:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 2014-05-14 00:03:30 -05:00
Marc Zinnschlag
199f030d38 adjusted cmake file for opencs user settings file rename 2014-05-09 17:19:44 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 2014-05-09 08:32:52 -05:00
Marc Zinnschlag
21142711f0 Merge remote-tracking branch 'graffy76/master' 2014-05-07 10:35:11 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 2014-05-05 05:56:03 -05:00
Thoronador
688d556510 remove references to Audiere and MPG123 from top-level CMake file 2014-05-03 21:20:22 +02:00
Sandy
36914b43d7 Remove install of License of no longer used font 2014-05-01 08:19:05 -04:00
scrawl
78d322e6a5 Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test." 
This reverts commit 529d2436b5.
 2014-04-01 11:44:27 +02:00
Lukasz Gromanowski
529d2436b5 Temporary added broken CMakeLists.txt - Travis IRC notification test. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-03-31 22:14:12 +02:00
pvdk
ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 2014-03-29 11:56:35 +01:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
Alexander "Ace" Olofsson
7ed3effc92 Fix windows packaging issue now that the OFL license doesn't exist 
anymore.
 2014-03-19 12:01:53 +01:00
scrawl
9089df3080 Add unity build option 
Each component and each MW-subsystem will be used as a single compilation unit.
 2014-03-16 23:49:12 +01:00
pvdk
8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 2014-03-16 20:05:12 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
Marc Zinnschlag
6101916b7d bumped version number 2014-03-04 08:52:48 +01:00
pvdk
c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
 2014-02-19 19:26:07 +01:00
pvdk
56d537e23d Added some sanity checking: compare git version with manual version 2014-02-19 14:37:27 +01:00
pvdk
b43325119a Some changes to the version retrieval: ignore shallow clones 2014-02-19 14:19:08 +01:00
pvdk
85b7240948 Made the git version retrieval more reliable 2014-02-19 13:43:14 +01:00
Nikolay Kasyanov
4a61868521 OS X: fixed Ogre plugin packaging 2014-02-16 19:01:28 +04:00
Nikolay Kasyanov
e4017b8bfe It seems that OctreeSceneManager is not required anymore 2014-02-16 14:16:45 +04:00
Nikolay Kasyanov
3c281c6a62 OS X: specify path to framework binary, not to framework directory 2014-02-16 14:12:45 +04:00
Nikolay Kasyanov
c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676 Merge branch 'master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:34:06 +04:00
scrawl
4e6507248b Fix travis build 2014-02-13 12:19:21 +01:00
pvdk
19bef4fce8 Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
pvdk
43bc223e68 Added version info retrieval from git tags 2014-01-22 17:04:49 +01:00
scrawl
37a59a37c6 Remove cpack (no longer used, according to BrotherBrick) 2014-01-17 15:20:28 +01:00
scrawl
659d790048 uuid is not used 2014-01-17 15:20:28 +01:00
scrawl
d4aeb177f9 Remove unused btKinematicCharacterController 2014-01-15 14:53:29 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +01:00
Dmitriy 'Endorph' Shkurskiy
116f125f05 Windows-specific definition to deny SDL from providing it's own WinMain() 2014-01-04 07:46:30 +02:00
Marc Zinnschlag
0d3e67dafc Merge branch 'master' into openmw-28 2014-01-02 13:39:36 +01:00
scrawl
5b0a4c9424 Get rid of unused file and some other cruft. 2014-01-02 01:44:09 +01:00
Marc Zinnschlag
fe34c9cf1f increased version number 2014-01-01 15:06:31 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Nikolay Kasyanov
892ff93489 OS X: attempt to fix #1045 2013-12-25 00:25:58 +04:00
Nikolay Kasyanov
73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized 
plugin install routine.
 2013-12-12 15:20:04 +04:00
Nikolay Kasyanov
874ecee079 OS X: do not enforce static boost, this can be set externally 
anyway
 2013-12-12 14:20:13 +04:00
Nikolay Kasyanov
89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 2013-12-12 14:19:48 +04:00
Nikolay Kasyanov
87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 2013-12-12 13:53:35 +04:00
Nikolay Kasyanov
99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 2013-12-12 13:53:35 +04:00
pvdk
d8f20d2e66 Added the infrastructure to start working on the installation wizard 2013-12-07 16:17:07 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
eroen
d4b8ac5b49 don't dpkg on windows and macos 
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
 2013-11-15 16:53:05 +01:00
eroen
67284e2f9d Introduce -DBUILD_WITH_DPKG to toggle dpkg based install 
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.

This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
 2013-11-15 15:59:38 +01:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Marc Zinnschlag
ef401a774b Merge remote-tracking branch 'eroen/install-fix' 2013-11-08 09:10:44 +01:00
Marc Zinnschlag
224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 2013-11-08 09:10:26 +01:00
Bret Curtis
5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-08 09:08:56 +01:00
eroen
e885c502a1 Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:37:55 +01:00
eroen
6b931f566d Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:30:15 +01:00
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
Marc Zinnschlag
f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 2013-11-05 08:19:29 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
Marc Zinnschlag
b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 2013-10-29 14:18:13 +01:00
Alexander "Ace" Olofsson
632a53ead4 Support packing the OpenCS into windows builds 2013-10-29 13:28:43 +01:00
Marc Zinnschlag
29fce6d11f increased version number 2013-10-28 08:45:56 +01:00
Marek Kochanowicz
b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4 This appears to work. 2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 2013-10-20 09:50:16 +02:00
Nikolay Kasyanov
3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 2013-10-14 20:37:55 +04:00
Nikolay Kasyanov
a18e3c9cc1 Fixed packaging when building against Ogre 1.9 2013-09-15 23:10:21 +04:00
Nikolay Kasyanov
36fb89c6cd Cleanup 2013-09-15 23:03:07 +04:00
Marc Zinnschlag
9637e1641b fix for building with system tinyxml 2013-09-14 13:33:49 +02:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
Marc Zinnschlag
4dbacdc6bd increased version number 2013-09-02 10:58:58 +02:00
Marc Zinnschlag
0c8f85f17d Merge remote-tracking branch 'wheybags/master' 2013-08-20 11:05:50 +02:00
scrawl
13afcc9324 Don't link to OgreTerrain 2013-08-19 22:22:14 +02:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Tom Mason
ceb3317807 Integrate unshield with launcher 2013-08-19 20:19:01 +01:00
eroen
8d925b7fd6 cleanup 
-   drop trailing slashes from paths for consistency
-   sort entries that got unsorted
 2013-08-19 20:39:37 +02:00
eroen
0076c558d6 Re-introduce lost functionality 
The branch merged in 5a863589b4 removed fine-grained configure-time control
over install paths. This is necessary to accomodate various linux distros'
policies, eg. Gentoo wants games installed in /usr/games, but with resource
files in /usr/share/games.

DOCDIR and MANDIR appear to be unused, and were not re-introduced.
 2013-08-19 20:39:37 +02:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
bwrsandman
36fb7f3a72 Cleanup 2013-07-31 11:51:33 -04:00
bwrsandman
71a75d2ab8 Small fixes 2013-07-31 11:49:23 -04:00
bwrsandman
9a900908cd Merge deb and non-deb 2013-07-31 11:25:11 -04:00
bwrsandman
e22b7c8fc1 Add use of SYSCONFDIR path for conf files in deb 2013-07-31 11:11:03 -04:00
bwrsandman
799c84b846 Moved deb version checking down with cpack 2013-07-31 10:27:01 -04:00
bwrsandman
3baf44c4b5 Moved non-deb install section up for readability 2013-07-31 10:19:05 -04:00
bwrsandman
0e02d7817e Moved non-deb up for readability 2013-07-31 10:13:04 -04:00
bwrsandman
b6e3b5e834 Add licenses to installed files for non-deb packages. 2013-07-31 09:47:12 -04:00
bwrsandman
98289f051f Set location for all non apple unixes, not just debian. 2013-07-31 04:04:27 -04:00
Marc Zinnschlag
20e92c2cdf increased version number 2013-07-21 14:17:01 +02:00
k1ll
39a12ab9cf CXX Flags aren't definitions 2013-06-27 19:20:14 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
7175c7cfe0 Updated OpenMW project CMakeLists.txt to include opencs.cfg file 
installation.
 2013-06-23 21:17:52 -05:00
Bret Curtis
84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 2013-06-18 14:31:47 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
Nikolay Kasyanov
6abb7a18b0 SDL2 input: seems to work on OS X, has some input issues though 2013-06-15 14:40:18 +04:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
Nikolay Kasyanov
d13430e2b8 Fix for CMake > 2.8.9 on OS X 2013-06-09 20:59:31 +04:00
eroen
886bc7e2f6 libc++ fixes: don't rely on tr1 
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.

Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
 2013-05-26 12:44:30 +02:00
Marc Zinnschlag
3ae02547d2 increased version number 2013-05-23 22:42:36 +02:00
scrawl
a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 2013-05-22 21:01:05 +02:00
bwrsandman
8cdef343ef take default prefix into account 2013-05-10 05:21:10 -04:00
bwrsandman
642ac15721 moved openmw resources to /usr/share/games and added missing files 2013-05-09 23:24:46 -04:00
bwrsandman
a5db557e22 fixed /share to be /usr/share 2013-05-09 22:32:43 -04:00
Marc Zinnschlag
3b3a052f4f increased version number 2013-04-18 22:36:48 +02:00
Chris Robinson
81615c1ae5 Add a custom GrowFade particle affector 2013-04-06 00:18:36 -07:00
Alexander "Ace" Olofsson
8d706f8183 Include the ini importer in windows packages 2013-03-16 10:36:35 +01:00
vorenon
00deff1758 fixed path for launcher icons 2013-03-13 09:37:14 +01:00
pvdk
30f3fbac3c Fixed paths to OpenMW icons 2013-03-12 21:21:08 +01:00
Marc Zinnschlag
d6a5915bbd updated version to 0.22.0 2013-03-12 14:56:11 +01:00
Marc Zinnschlag
5e113627b7 Merge remote-tracking branch 'psi29a/master' 2013-03-10 09:29:21 +01:00
Bret Curtis
b8c42fde1f removed chrono from deps, not needed for boost < 1.50 2013-03-10 08:48:54 +01:00
Sandy Carter
b457c7de5e added linux opencs.desktop file 2013-03-09 02:43:29 -05:00
Bret Curtis
207f78ab77 added two additional required boost libs to build on windows, one of which is already pulled by other boost lib in Ubuntu. 2013-03-08 15:30:53 +01:00
Emanuel Guevel
3adf3f5121 Revive bsatool 2013-03-07 21:13:10 +01:00
Pieter van der Kloet
f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 2013-03-03 00:48:09 +01:00
scrawl
9810eafe23 Removing now unused oengine/imagerotate 2013-03-01 22:27:53 +01:00
Marc Zinnschlag
372308b49a Merge remote-tracking branch 'amdmi3/installation-fixes' 2013-02-28 10:04:42 +01:00
Dmitry Marakasov
0e8ff22d6f Only install binaries which are enabled to be built 2013-02-28 07:20:56 +04:00
Alexander "Ace" Olofsson
d5aa975675 Fix some issues that seem to have appeared in the CMake configuration. 2013-02-27 23:44:20 +01:00
Dmitry Marakasov
f994b7d227 Prepare .desktop file for more systems 
This brings condition for .desktop file preparation in sync with
condition for its installation.
 2013-02-27 07:44:35 +04:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Nathan Jeffords
1af4e11414 apply MSVC warning settings to shiny projects 2013-02-23 10:24:18 -08:00
Chris Robinson
3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 2013-02-22 01:34:22 -08:00
hasufell
56468eaecf Add install rule for opencs 2013-02-21 19:19:53 +01:00