ac8d347e9e
we have html output and autodoc functionality
9 years ago
28c63aea72
Uses FindTinyXML to find package
9 years ago
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
56548b384d
Include FindPkgMacros to use make_library_set
...
In CMakList.txt there is make_library_set and macro for it is defined in FindPkgMacros, so FindPkgMacros needs to be imported to avoid Error: Unknown CMake command "make_library_set".
9 years ago
fcbcc004a3
Don't use unordered_map
9 years ago
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
a6b67154bb
Use builtin compiler version in CMake scripts
9 years ago
62af1b67cf
increased version number
9 years ago
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
a7b78b37f5
disable opengles for Android by default
9 years ago
52f4c07648
Enable -Wundef
9 years ago
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
9 years ago
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
9 years ago
41675be970
Merge branch 'openmw-38'
9 years ago
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
48f4fc34eb
build fixes for Android
9 years ago
6c676c861c
increased version number
9 years ago
4be6b362c5
Add OpenMW-mp target
9 years ago
93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
9 years ago
9c7bbd667b
Merge branch 'usersettings'
9 years ago
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
7db307e028
delete unused variables
9 years ago
7d374b36fd
change cmake variables
9 years ago
d9b1b7c516
addd forgotten line
9 years ago
238a5824be
add custom new variable fot Qt
9 years ago
bd5057aa3c
enable opengl es1
9 years ago
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
9 years ago
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
9 years ago
84305a1297
Reuse DATADIR in data paths
9 years ago
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
2108e96c15
OS X: use TGA, PNG & JPEG plugins instead of ImageIO
...
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
9 years ago
020b3add94
Merge branch 'openmw-37'
9 years ago
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
63c47a78d6
OS X: fixup Qt plugin during packaging
9 years ago
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
9 years ago
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
9 years ago
5c4899580f
OS X: use less ambiguous variable names in packaging code
9 years ago
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
9 years ago
3ea3d07d44
really purge libav
9 years ago
cdf17f415e
updated version number
9 years ago
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
10 years ago
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
10 years ago
34d601360f
OS X: setup OSG plugins packaging
10 years ago
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
10 years ago
46ce04a65b
Don't package duplicate version for Windows
...
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
10 years ago
581ea26605
Add appdata file for openmw and install it
10 years ago
2a653e45fd
(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.
10 years ago
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
10 years ago
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
d9a00288f8
Make install fix
10 years ago
58917bcca6
Minor cleanup
10 years ago
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
cdd0623009
Terrain rendering
10 years ago
b0b55e2037
Delete niftest as it's currently broken
10 years ago
d05d7f51d9
increased version number
10 years ago
62ce2cc123
Minor cleanup
10 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
f2809ab63b
Delete nifosgtest again
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
fe15f31f3e
Remove strings.h wrapper
10 years ago
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
9f6bc1b3a9
increased version number
10 years ago
c1edc30ad7
Dead code removal
10 years ago
157d8bfedd
Remove unused mygui files
10 years ago
fe03727ae5
Don't force linking static boost libraries when building with mingw
10 years ago
48a6d7c1a0
Remove mygui platform libraries from cmake
10 years ago
8410966753
Disable mygui plugin for now
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
42f6d9e15b
Port video player
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
e6cf959134
Revert "Delete nifosgtest"
...
This reverts commit ba3075dc11
10 years ago
ba3075dc11
Delete nifosgtest
10 years ago
d646836cdd
turn on -Wno-potentially-evaluated-expression on clang
10 years ago
af67de73a5
Delete shiny
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
12f27123f2
Billboard scaling fix and culling bug fix
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
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
Bret Curtis
Roman Proskuryakov
makson96
scrawl
Marc Zinnschlag
sandstranger
Alexander "Ace" Olofsson
Koncord
Paul Cercueil
Dmitry Marakasov
Nikolay Kasyanov
Alexandre Moine
Arthur Moore
slothlife
Rohit Nirmal
k1ll
Scott Howard
Digmaster
Rosanne DiMesio
Marco Schulze