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
