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.
2015-06-08 15:41:39 +02:00
scrawl
d9a00288f8
Make install fix
2015-06-08 01:58:12 +02:00
scrawl
58917bcca6
Minor cleanup
2015-06-04 01:24:29 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
b0b55e2037
Delete niftest as it's currently broken
2015-06-01 02:48:15 +02:00
scrawl
62ce2cc123
Minor cleanup
2015-05-30 20:44:19 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
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
2015-05-23 20:33:44 +02:00
scrawl
f2809ab63b
Delete nifosgtest again
2015-05-23 06:53:26 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
scrawl
fe15f31f3e
Remove strings.h wrapper
2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
2015-05-10 00:28:51 +02:00
Marc Zinnschlag
9f6bc1b3a9
increased version number
2015-05-04 19:06:02 +02:00
scrawl
c1edc30ad7
Dead code removal
2015-05-04 03:29:12 +02:00
scrawl
157d8bfedd
Remove unused mygui files
2015-05-03 17:26:12 +02:00
k1ll
fe03727ae5
Don't force linking static boost libraries when building with mingw
2015-04-29 18:31:30 +02:00
scrawl
48a6d7c1a0
Remove mygui platform libraries from cmake
2015-04-28 16:33:30 +02:00
scrawl
8410966753
Disable mygui plugin for now
2015-04-22 18:01:55 +02:00
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b
Port video player
2015-04-19 20:07:18 +02:00
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
scrawl
e6cf959134
Revert "Delete nifosgtest"
...
This reverts commit ba3075dc11
2015-04-11 14:46:52 +02:00
scrawl
ba3075dc11
Delete nifosgtest
2015-04-02 16:28:16 +02:00
Scott Howard
d646836cdd
turn on -Wno-potentially-evaluated-expression on clang
2015-04-01 22:09:20 -04:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
scrawl
12f27123f2
Billboard scaling fix and culling bug fix
2015-03-30 17:11:27 +02:00
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
2015-03-27 17:30:48 +01:00
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
2015-03-20 16:22:33 +01:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
Scott Howard
d7baf92353
tell include_directories which libraries are system libs
2015-03-09 16:49:40 -04:00
Scott Howard
88f746574d
fix compiler detection and adding build flags in CMakeLists.txt
2015-03-09 14:37:43 -04:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
Marc Zinnschlag
cdf53c17e7
updated version number
2015-03-03 11:54:35 +01:00
scrawl
1eaa64c49c
CMake: remove lines for MinGW, no one is maintaining those
2015-03-02 15:45:44 +01:00
scrawl
c6aa374934
CMake: set windows warning levels globally instead of per target
2015-03-02 15:45:29 +01:00
scrawl
c57f9ad5dc
CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None
2015-03-02 15:44:27 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
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
2015-02-27 22:21:02 +01:00
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
2015-02-27 22:19:13 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
scrawl
8d64f2081e
Add particle system state loading
2015-02-24 01:25:31 +01:00
scrawl
8e01d8cb19
Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers.
2015-02-23 21:06:10 +01:00
scrawl
8c10d4badb
NIF reader compiles without Ogre
2015-02-17 17:08:55 +01:00
scrawl
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
2015-02-17 16:19:21 +01:00
scrawl
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
2015-02-17 16:05:28 +01:00
