scrawl
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
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
Alexander "Ace" Olofsson
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
scrawl
d9a00288f8
Make install fix
10 years ago
scrawl
58917bcca6
Minor cleanup
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
cdd0623009
Terrain rendering
10 years ago
scrawl
b0b55e2037
Delete niftest as it's currently broken
10 years ago
Marc Zinnschlag
d05d7f51d9
increased version number
10 years ago
scrawl
62ce2cc123
Minor cleanup
10 years ago
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
scrawl
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
scrawl
f2809ab63b
Delete nifosgtest again
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
fe15f31f3e
Remove strings.h wrapper
10 years ago
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
Marc Zinnschlag
9f6bc1b3a9
increased version number
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
157d8bfedd
Remove unused mygui files
10 years ago
k1ll
fe03727ae5
Don't force linking static boost libraries when building with mingw
10 years ago
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
10 years ago
scrawl
8410966753
Disable mygui plugin for now
10 years ago
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
scrawl
42f6d9e15b
Port video player
10 years ago
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
scrawl
e6cf959134
Revert "Delete nifosgtest"
...
This reverts commit ba3075dc11
.
10 years ago
scrawl
ba3075dc11
Delete nifosgtest
10 years ago
Scott Howard
d646836cdd
turn on -Wno-potentially-evaluated-expression on clang
10 years ago
scrawl
af67de73a5
Delete shiny
10 years ago
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
scrawl
12f27123f2
Billboard scaling fix and culling bug fix
10 years ago
scrawl
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
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
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