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
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
