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 |
|
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 |