f0a7b202b9
Merge branch 'openmw-35-1'
10 years ago
d7baf92353
tell include_directories which libraries are system libs
10 years ago
88f746574d
fix compiler detection and adding build flags in CMakeLists.txt
10 years ago
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
cdf53c17e7
updated version number
10 years ago
1eaa64c49c
CMake: remove lines for MinGW, no one is maintaining those
10 years ago
c6aa374934
CMake: set windows warning levels globally instead of per target
10 years ago
c57f9ad5dc
CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
10 years ago
1e4a845b6f
Minor code cleanup
10 years ago
a9b74671a6
Fix various MSVC warnings
10 years ago
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
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.
10 years ago
2b619296d7
Merge remote-tracking branch 'scrawl/master'
10 years ago
003d0610f4
Merge remote-tracking branch 'ace/link-time-optimzation'
10 years ago
9da0a9f8c4
Enable link-time optimization on MSVC
10 years ago
399c24c646
CMake cleanup: remove redundant setting of Permissions to default values
10 years ago
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
10 years ago
28eb766bba
Respect LIB_SUFFIX
10 years ago
5534306eb3
Few rename fixes
10 years ago
abb334bc1e
Missing change for the tool rename
10 years ago
c02537c3b1
incremented version number
10 years ago
0557d45bd1
renamed opencs into openmw-cs
10 years ago
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
8e5c8aa562
Add support for passing in Ogre plugin directory via CMake
10 years ago
f4bf2aa412
Merge remote-tracking branch 'origin/master'
10 years ago
ebe2e1491a
Fix broken windows builds due to README change
10 years ago
031eec4550
Starting ESS importer for Morrowind save files
10 years ago
595c08817f
Merge remote-tracking branch 'scrawl/master'
10 years ago
e439065897
Merge remote-tracking branch 'scrawl/master'
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
9d07edda13
UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04
10 years ago
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
d67ad9037e
increased version number
10 years ago
a8a2b44b0f
Don't require libunshield on windows
10 years ago
d4a9cf7075
Fix wizard install location
10 years ago
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
45d41e22e2
Merge branch 'openmw-33'
10 years ago
5909fa4368
new version number and updated changelog
10 years ago
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.
10 years ago
a3c894c1e2
Merge branch 'cellmarker'
10 years ago
86f5073293
increased version number
10 years ago
Marc Zinnschlag
Scott Howard
scrawl
Digmaster
slothlife
Alexander "Ace" Olofsson
Rosanne DiMesio
Nikolay Kasyanov
Arthur Moore
Marco Schulze