Commit Graph

1712 Commits (fc66d81950e51e3a69ae3e85fdc0990116a4ffce)
 

Author SHA1 Message Date
scrawl fc66d81950 update openengine 13 years ago
scrawl 8b5da06fce Merge branch 'next' into weather
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag db205cf8aa Merge remote branch 'scrawl/next' into test
Conflicts:
	libs/openengine
13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag ade6658d4d Merge remote branch 'ace/win-packaging' 13 years ago
Marc Zinnschlag 781b16a00e removed bCollision variable from World 13 years ago
Marc Zinnschlag 7eae24bb45 some fixes 13 years ago
scrawl c884f70a61 added sun rendering (unfinished) 13 years ago
Jason Hooks 7e1e746201 More changes 13 years ago
scrawl 705d85e7d1 Merge branch 'next' into weather
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
scrawl 60856b46e6 moved the renderer update call from OMW::Engine to RenderingManager 13 years ago
scrawl 1d9f0f4813 added MWSkyManager; already has atmosphere and moving clouds (although their colour is static) 13 years ago
Jason Hooks 38a0d1d1c5 Merging in master 13 years ago
Jason Hooks e330c22d68 Removing unneeded files 13 years ago
Jason Hooks e58f2f5363 Eliminating unnecessary data from skeletons and shape saving 13 years ago
Jason Hooks 2217847c57 Fixing a crash 13 years ago
scrawl 457d9fd9f8 updated vmformat.txt 13 years ago
scrawl f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 13 years ago
scrawl 899aa5b870 fix last commit, also reacts to ToggleWireframe and not only twf 13 years ago
scrawl 40e23fe26f added twf console command 13 years ago
Alexander "Ace" Olofsson 6a71cf21b0 Added OpenAL redistributable to OpenMW installer 13 years ago
Marc Zinnschlag 10d4771550 Merge remote branch 'corristo/osx-packaging' 13 years ago
Marc Zinnschlag 1a6a49b9b8 Merge remote branch 'lgro/fix_warnings' 13 years ago
Nikolay Kasyanov 5a42c6c6f5 Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher 13 years ago
Lukasz Gromanowski 8829d46bda Clean up compilation warnings.
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag 273eac12a1 Merge remote branch 'jhooks/animation2' into animation2
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	components/nifogre/ogre_nif_loader.cpp
13 years ago
Marc Zinnschlag facc36fa34 Merge remote branch 'corristo/osx-packaging' into packaging 13 years ago
Marc Zinnschlag 8ae2120e15 Merge remote branch 'ace/win-packaging' into packaging 13 years ago
Marc Zinnschlag a0ac6e5150 cells were sometimes not fully loaded 13 years ago
Marc Zinnschlag bc71fb47e0 minor fix 13 years ago
Pieter van der Kloet 17b1546dc1 Changed the way screenshots are created (Bug #191) 13 years ago
Marc Zinnschlag 4fcb721054 openengine update (physics crash workaround 13 years ago
Marc Zinnschlag bb7730a708 Merge branch 'lightfix' 13 years ago
gugus 597e670eef corrected the light problem 13 years ago
Marc Zinnschlag 00ac2deefb Merge remote branch 'pvdk/cmakeogre' into cmakeogre 13 years ago
Marc Zinnschlag b878c87ba8 Merge branch 'renderingfix' 13 years ago
Pieter van der Kloet 7bf8497215 Fixed CMake problem with Ogre plugins path 13 years ago
Pieter van der Kloet efe3a3fcbe Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre 13 years ago
Marc Zinnschlag c4e028effe fixing a faulty include 13 years ago
Marc Zinnschlag 0b0254d30e spelling fix 13 years ago
Marc Zinnschlag 784c6fe0ff some cleanup 13 years ago
Marc Zinnschlag e1600d9a2a fixed movable object cleanup for ordinary objects 13 years ago
Marc Zinnschlag c471aa950f re-enabled batching for statics; fixed a misplaced assert 13 years ago
Marc Zinnschlag ee02154805 lights without a mesh were not rendered 13 years ago
Marc Zinnschlag 52a6605f10 Merge remote branch 'mirc/refactor_wm' into refactor_wm
- changed the way dynamics stats are passed to the character creation object
- some more clean up

Conflicts:
	.gitignore
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
13 years ago
Marc Zinnschlag c447ea073c Merge branch 'cmakefix' into next 13 years ago
Cris Mihalache 4bc7051741 Finished refactoring, brought CharacterCreation up to standards 13 years ago
Nikolay Kasyanov 472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 13 years ago
Pieter van der Kloet c255c519e4 Replaced FindOGRE.cmake, this one looks for debug libraries too 13 years ago
Cris Mihalache ed5892eb5c Finished moving the bulk of character creation code 13 years ago