Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
10 years ago
Scott Howard
d7baf92353
tell include_directories which libraries are system libs
10 years ago
Scott Howard
88f746574d
fix compiler detection and adding build flags in CMakeLists.txt
10 years ago
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
Marc Zinnschlag
cdf53c17e7
updated version number
10 years ago
scrawl
1eaa64c49c
CMake: remove lines for MinGW, no one is maintaining those
10 years ago
scrawl
c6aa374934
CMake: set windows warning levels globally instead of per target
10 years ago
scrawl
c57f9ad5dc
CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None
10 years ago
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
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
10 years ago
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
10 years ago
Digmaster
1e4a845b6f
Minor code cleanup
10 years ago
scrawl
8d64f2081e
Add particle system state loading
10 years ago
scrawl
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
10 years ago
scrawl
8c10d4badb
NIF reader compiles without Ogre
10 years ago
scrawl
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
10 years ago
scrawl
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
10 years ago
slothlife
a9b74671a6
Fix various MSVC warnings
10 years ago
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
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.
10 years ago
Marc Zinnschlag
2b619296d7
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
003d0610f4
Merge remote-tracking branch 'ace/link-time-optimzation'
10 years ago
Alexander "Ace" Olofsson
9da0a9f8c4
Enable link-time optimization on MSVC
10 years ago
scrawl
399c24c646
CMake cleanup: remove redundant setting of Permissions to default values
10 years ago
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
scrawl
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
.
Conflicts:
CMakeLists.txt
10 years ago
Rosanne DiMesio
28eb766bba
Respect LIB_SUFFIX
10 years ago
Nikolay Kasyanov
5534306eb3
Few rename fixes
10 years ago
Alexander "Ace" Olofsson
abb334bc1e
Missing change for the tool rename
10 years ago
Marc Zinnschlag
c02537c3b1
incremented version number
10 years ago
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
10 years ago
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
scrawl
8e5c8aa562
Add support for passing in Ogre plugin directory via CMake
10 years ago
Marc Zinnschlag
f4bf2aa412
Merge remote-tracking branch 'origin/master'
10 years ago
Alexander "Ace" Olofsson
ebe2e1491a
Fix broken windows builds due to README change
10 years ago
scrawl
031eec4550
Starting ESS importer for Morrowind save files
10 years ago
Marc Zinnschlag
595c08817f
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
eecea4131f
Reduce MyGUI includes
10 years ago
scrawl
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
Marc Zinnschlag
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
Marc Zinnschlag
d67ad9037e
increased version number
10 years ago
scrawl
a8a2b44b0f
Don't require libunshield on windows
10 years ago
scrawl
d4a9cf7075
Fix wizard install location
10 years ago
scrawl
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
Marc Zinnschlag
45d41e22e2
Merge branch 'openmw-33'
10 years ago
Marc Zinnschlag
5909fa4368
new version number and updated changelog
10 years ago
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.
10 years ago
Marc Zinnschlag
a3c894c1e2
Merge branch 'cellmarker'
10 years ago
Marc Zinnschlag
86f5073293
increased version number
10 years ago
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
vocollapse
772c66eedf
Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen.
10 years ago
cc9cii
f459adf117
Revert CMake changes (didn't work for osx anyway)
10 years ago
cc9cii
971b0de4fa
An attempt to make osx to find the ogre overlay headers.
10 years ago
cc9cii
758ce0ed98
Various fixes as per feedback comments.
10 years ago
vocollapse
71f3f71f78
added make target for doxygen: make doc, make doc_pages
10 years ago
cc9cii
972c789060
Add Ogre Overlay path to cmake.
10 years ago
scrawl
62ea913e69
Fix cmake warning
10 years ago
Marc Zinnschlag
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
10 years ago
slothlife
35ced14e45
Fix for MSVC warnings
10 years ago
eroen
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
10 years ago
Marc Zinnschlag
5c8ef842b6
Merge branch 'edit'
10 years ago
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
10 years ago
Sebastian Wick
f46da271d7
SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr"
10 years ago
Sebastian Wick
2ae8158ee9
SYSCONFDIR and LinuxPath should work with different install prefixs
10 years ago
Stanislav
313bdf4e78
fix
10 years ago
Stanislav
76f2e5d5b8
CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build.
10 years ago
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
10 years ago
cc9cii
d92400e550
Remove libavresample restriction.
10 years ago
cc9cii
166ee6b483
Do not use cached FFMPEG_LIBRARIES. Make error messages clearer.
10 years ago
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
10 years ago
scrawl
9d05718515
Move plugin to new plugins/ top level directory
10 years ago
Marc Zinnschlag
f142d82b3a
Merge remote-tracking branch 'ace/win-package-fix'
10 years ago
Marc Zinnschlag
2397a87330
Merge remote-tracking branch 'scrawl/bsatool'
10 years ago
Alexander "Ace" Olofsson
dd3d7ba474
Update NSIS to use the new icon path
10 years ago
scrawl
ecfc2ff5d0
Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools
10 years ago
scrawl
1bb9359b4c
Fix a typo
10 years ago
scrawl
fca8dc9674
Enable bsatool build by default
10 years ago
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
10 years ago
cc9cii
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
10 years ago
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
10 years ago
cc9cii
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
10 years ago
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.
10 years ago
Marc Zinnschlag
b6a3541573
increased version number
10 years ago
scrawl
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
10 years ago
Arthur Moore
53ce94d0e4
Disable building nif file tester by default
11 years ago
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.
11 years ago
scrawl
77a4e38c49
Remove -Wno-ignored-qualifiers and fix caused warnings
11 years ago
Marc Zinnschlag
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
11 years ago
root
713787d92f
fix v7
11 years ago
root
3cd98e5259
fix code v5
10 years ago
root
d8772156a7
fixe all code v 2
11 years ago
root
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
root
16aafc26bc
fixed cmake for build on all plaforms include android
11 years ago
scrawl
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago