Commit Graph

2092 Commits (e7c3ddfe40d0501c81df3ebb5f527553d87799c9)
 

Author SHA1 Message Date
Marc Zinnschlag d9c1ed3d5e Merge remote branch 'corristo/osx-packaging' into config 13 years ago
Nikolay Kasyanov ee92da3c4a Merge remote-tracking branch 'upstream/master' 13 years ago
Nikolay Kasyanov 2020d916ec added missing comment 13 years ago
Nikolay Kasyanov 57a4b19880 Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete 13 years ago
Marc Zinnschlag 7b457c05bc updated readme 13 years ago
Marc Zinnschlag 8277df04b1 bumping version number 13 years ago
Marc Zinnschlag e1defd3595 adjusted the globally installed openmw.cfg file 13 years ago
Marc Zinnschlag 9af08ff18d store screenshots in user directory instead of local directory 13 years ago
Marc Zinnschlag 77201d05bc post-merge fix 13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
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
Lukasz Gromanowski bcc4d7a7c9 Issue #133 Handle resources across multiple data directories
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
Lukasz Gromanowski 4fae3bd7c6 Merge pull request #3 from pvdk/config
Changed the order of preference for the configuration files
13 years ago
Pieter van der Kloet eea8773be1 Changed the order of preference for the configuration files 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 4a188f2820 Merge remote branch 'gus/master' 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
gugus 8affa30ff1 magic commit that fixe the crash when activating collision after changing cell.
To be faire, this commit should break the collision system... there must be something I don't understand with bullet ghost objects :p
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
Nikolay Kasyanov df6d9c7fa4 Merge remote-tracking branch 'upstream/master' 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
Cris Mihalache d17ba6ce19 Forgot the CharacterCreation files 13 years ago
Cris Mihalache 4b758376be Created a class for char gen, and starting moving code to it 13 years ago
Marc Zinnschlag 78b6ceabc7 Merge branch 'refdata' into equipment 13 years ago
Marc Zinnschlag e19cea3e7b Merge branch 'refdata' into next 13 years ago
Marc Zinnschlag a4785ffc4f minor fix 13 years ago