Commit Graph

647 Commits (e1f4a7f6475a43aa534d8431ea5520a7a1f46698)

Author SHA1 Message Date
scrawl 157d8bfedd Remove unused mygui files 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