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
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
11 years ago
scrawl
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
11 years ago
Marc Zinnschlag
7316f4dde4
increased version number
11 years ago