Commit Graph

2072 Commits (b4343431c66ac8c75c06e29fcca9200dc0341ac9)
 

Author SHA1 Message Date
Marc Zinnschlag 420e611a4b Merge remote branch 'scrawl/next' into next 13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag 1beaea0115 forgot to add cone file 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
Marc Zinnschlag 4a16553acc replaced an include with a forward declaration 13 years ago
Marc Zinnschlag e3e6b3809f added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write) 13 years ago
scrawl c884f70a61 added sun rendering (unfinished) 13 years ago
Lukasz Gromanowski 0c0b594090 Issue #168 - Configuration cleanup
Removed unnecessary path methods - according to forum disscusion:

http://openmw.org/forum/viewtopic.php?f=6&t=448

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
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
scrawl eb61ba59e6 updated the fading calculation (the alpha value stays now, even after the specified time - this is how it is in morrowind) 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 b77f5c06cc added facilities for fading the screen in/out 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
Marc Zinnschlag 8186445de9 fix for a very silly bug 13 years ago
Marc Zinnschlag 850501e922 workaround for the configuration problems 13 years ago
Marc Zinnschlag 8244ed5860 workaround for space in paths problem 13 years ago
Marc Zinnschlag ddb8b1e1bc Merge remote branch 'lgro/config' into config 13 years ago
Alexander "Ace" Olofsson 6a71cf21b0 Added OpenAL redistributable to OpenMW installer 13 years ago
Lukasz Gromanowski 80008ed09f Issue #168 - Configuration cleanup
Fixed bug with configuration tokens parsing - when something
appear after token it should be appended to replaced path.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
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