34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
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
8d64f2081e
Add particle system state loading
10 years ago
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
10 years ago
8c10d4badb
NIF reader compiles without Ogre
10 years ago
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
10 years ago
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
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
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
772c66eedf
Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen.
10 years ago
f459adf117
Revert CMake changes (didn't work for osx anyway)
10 years ago
971b0de4fa
An attempt to make osx to find the ogre overlay headers.
10 years ago
758ce0ed98
Various fixes as per feedback comments.
10 years ago
71f3f71f78
added make target for doxygen: make doc, make doc_pages
10 years ago
972c789060
Add Ogre Overlay path to cmake.
10 years ago
62ea913e69
Fix cmake warning
10 years ago
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
10 years ago
35ced14e45
Fix for MSVC warnings
10 years ago
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
10 years ago
5c8ef842b6
Merge branch 'edit'
10 years ago
b1e74e2a85
Remove support for Ogre 1.8 versions
10 years ago
f46da271d7
SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr"
10 years ago
2ae8158ee9
SYSCONFDIR and LinuxPath should work with different install prefixs
10 years ago
313bdf4e78
fix
10 years ago
76f2e5d5b8
CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build.
10 years ago
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
10 years ago
d92400e550
Remove libavresample restriction.
10 years ago
166ee6b483
Do not use cached FFMPEG_LIBRARIES. Make error messages clearer.
10 years ago
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
10 years ago
9d05718515
Move plugin to new plugins/ top level directory
10 years ago
f142d82b3a
Merge remote-tracking branch 'ace/win-package-fix'
10 years ago
2397a87330
Merge remote-tracking branch 'scrawl/bsatool'
10 years ago
dd3d7ba474
Update NSIS to use the new icon path
10 years ago
ecfc2ff5d0
Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools
10 years ago
1bb9359b4c
Fix a typo
10 years ago
fca8dc9674
Enable bsatool build by default
10 years ago
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
10 years ago
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
10 years ago
c6cad5adc5
Make cmake more reliably detect libswresample
10 years ago
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
10 years ago
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
b6a3541573
increased version number
10 years ago
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
10 years ago
53ce94d0e4
Disable building nif file tester by default
11 years ago
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
77a4e38c49
Remove -Wno-ignored-qualifiers and fix caused warnings
11 years ago
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
11 years ago
713787d92f
fix v7
11 years ago
3cd98e5259
fix code v5
10 years ago
d8772156a7
fixe all code v 2
11 years ago
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
16aafc26bc
fixed cmake for build on all plaforms include android
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
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
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
11 years ago
7316f4dde4
increased version number
11 years ago
96ba4a414f
Fix MSVC size_t conversion warning.
11 years ago
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
5960d3f1d9
These files moved, leading to package failure
11 years ago
7eee0855f7
Merge commit 'pull/origin/155'
...
Conflicts:
CMakeLists.txt
11 years ago
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
e28888df39
fix for dejavu location
11 years ago
8419002393
Task #940 : Move licenses to appropriate place in docs. Additional cleanup.
11 years ago
5313862a46
Merge remote-tracking branch 'scrawl/master'
11 years ago
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.
11 years ago
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
11 years ago
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
8f9091550e
require boost::locale only on Windows
11 years ago
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
11 years ago
b728a919a2
write dependency on boost::locale to CMake files
11 years ago
46c32f6c47
OpenEngine MyGUI logging facility
11 years ago
510b7f8505
Task #1333 : Remove cmake git tag reading
11 years ago
7c149e98e0
Merge branch 'openmw-30'
11 years ago
a5f0fe7282
incremented version number
11 years ago
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
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.
11 years ago
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
11 years ago
199f030d38
adjusted cmake file for opencs user settings file rename
11 years ago
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.
11 years ago
21142711f0
Merge remote-tracking branch 'graffy76/master'
11 years ago
a17cb1f389
Fixed opencs.ini formatting
11 years ago
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
688d556510
remove references to Audiere and MPG123 from top-level CMake file
11 years ago
36914b43d7
Remove install of License of no longer used font
11 years ago
78d322e6a5
Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test."
...
This reverts commit 529d2436b5
11 years ago
529d2436b5
Temporary added broken CMakeLists.txt - Travis IRC notification test.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
0a17245633
Refactored settings window
11 years ago
7ed3effc92
Fix windows packaging issue now that the OFL license doesn't exist
...
anymore.
11 years ago
9089df3080
Add unity build option
...
Each component and each MW-subsystem will be used as a single compilation unit.
11 years ago
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
6101916b7d
bumped version number
11 years ago
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
11 years ago
56d537e23d
Added some sanity checking: compare git version with manual version
11 years ago
b43325119a
Some changes to the version retrieval: ignore shallow clones
11 years ago
85b7240948
Made the git version retrieval more reliable
11 years ago
4a61868521
OS X: fixed Ogre plugin packaging
11 years ago
e4017b8bfe
It seems that OctreeSceneManager is not required anymore
11 years ago
scrawl
Marc Zinnschlag
Scott Howard
Digmaster
slothlife
Alexander "Ace" Olofsson
Rosanne DiMesio
Nikolay Kasyanov
Arthur Moore
Marco Schulze
cc9cii
vocollapse
eroen
Sebastian Wick
Stanislav
root
bogglez
Bret Curtis
pvdk
greye
graffy76
Thoronador
Sandy
Lukasz Gromanowski