Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
3c5f8a4a23
void pointer workaround
2012-02-29 10:13:25 +01:00
scrawl
c8aab3a562
fix sun angle
2012-02-28 20:28:46 +01:00
scrawl
b3db4f1c27
slightly improved moon fading
2012-02-28 15:20:46 +01:00
Marc Zinnschlag
053a2996d2
fix for non-standard erase function
2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson
be8690e333
Fix for debug crash on windows
2012-02-26 22:45:17 +01:00
scrawl
8b0ef8f98c
improvements to sun glare
2012-02-26 20:46:09 +01:00
scrawl
932983c2fa
fix toggleSky
2012-02-26 18:21:11 +01:00
scrawl
c1d39bb35f
tweaked cloud color
2012-02-26 15:54:52 +01:00
scrawl
f79bf1f300
fog
2012-02-26 13:13:29 +01:00
scrawl
8d5783d75d
- set moon phase using (day%32)/4 (not really correct, but good for now)
...
- added all weather patterns from morrowind.ini
2012-02-25 21:06:03 +01:00
scrawl
e31ad90802
moon positions and fading
2012-02-25 16:36:45 +01:00
scrawl
4650672bb1
thunderstorm
2012-02-25 13:46:17 +01:00
scrawl
0ebdce543a
- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise
...
- changed WeatherGlobals members to static
2012-02-24 23:26:38 +01:00
scrawl
9560904d8a
visibility fixes
2012-02-24 18:47:09 +01:00
scrawl
67c7b965f0
calculate a sun position depending on time of day
2012-02-24 18:30:16 +01:00
scrawl
811c4a41b7
fade in/out for sunrise and sunset
2012-02-24 17:42:31 +01:00
scrawl
aad8f6605e
send a raycast through the physics engine to check if sun is visible
2012-02-24 16:12:43 +01:00
scrawl
af83742e6f
- disable the sky renderer completely in interior cells
...
- SkyManager update (initial sun glare effect, no raycast)
2012-02-23 21:44:56 +01:00
scrawl
d9c02ca526
- added isCellExterior / isCellQuasiExterior methods to World
...
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
2012-02-23 21:12:06 +01:00
scrawl
90af78e3b8
attempt to fix openmw's lighting (restored the sun, set proper ambient value outside)
...
- the fix should remain in this branch since the main branch still has the lighting by caelum
2012-02-23 20:33:34 +01:00
scrawl
a5720e9a4f
set sky colors according to time of day
2012-02-23 19:49:56 +01:00
scrawl
41a8b22ebd
implemented weather transitions (currently only blends the clouds)
2012-02-22 19:17:37 +01:00
scrawl
b2de9e8f45
allow setting the clouds opacity
2012-02-21 22:11:41 +01:00
scrawl
83753dc384
tweaked the cloud animation speed
2012-02-21 17:42:43 +01:00
scrawl
91ffacbb6d
added moon phases
2012-02-21 17:38:15 +01:00
scrawl
10ca67c0a5
fixed the sky elements positioning delay (nodes are now children of the camera node)
2012-02-21 16:49:28 +01:00
scrawl
2d8b0a4ac0
merged the sky manager implementation with its interface
2012-02-21 16:15:38 +01:00
scrawl
694a537b57
- removed caelum sources, resources, build scripts
2012-02-21 00:14:20 +01:00
scrawl
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
2012-02-20 23:53:17 +01:00
scrawl
6aac3d4b77
- removed caelum (we can get it from the git history, if needed)
...
- added code for moon rendering (they are not visible by default)
2012-02-20 23:41:22 +01:00
scrawl
090c0586a0
leak fix
2012-02-20 22:20:34 +01:00
scrawl
6d37f53fa2
- abstracted the sun creation code into a CelestialBody class to be reused for the moons
...
- fixed render queue problem
2012-02-20 22:15:13 +01:00
scrawl
ad0f9f4bcf
fixed the sun rendering (rendered without depth check)
2012-02-20 21:32:12 +01:00
scrawl
3b3218d907
fixed 3 gcc warnings in sky.cpp
2012-02-20 18:45:04 +01:00
scrawl
8b5da06fce
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-02-20 18:33:13 +01:00
Marc Zinnschlag
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
2012-02-20 14:54:08 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
7eae24bb45
some fixes
2012-02-20 14:02:24 +01:00
scrawl
c884f70a61
added sun rendering (unfinished)
2012-02-20 00:52:44 +01:00
Jason Hooks
7e1e746201
More changes
2012-02-19 17:59:50 -05:00
scrawl
705d85e7d1
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-02-19 23:27:26 +01:00
scrawl
60856b46e6
moved the renderer update call from OMW::Engine to RenderingManager
2012-02-19 23:22:29 +01:00
scrawl
1d9f0f4813
added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)
2012-02-19 23:09:14 +01:00
Jason Hooks
38a0d1d1c5
Merging in master
2012-02-19 15:39:12 -05:00
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
2012-02-19 02:01:15 -05:00
scrawl
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
2012-02-18 18:25:28 +01:00
scrawl
40e23fe26f
added twf console command
2012-02-18 16:06:03 +01:00
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>
2012-02-12 15:45:08 +01:00
Marc Zinnschlag
bb7730a708
Merge branch 'lightfix'
2012-02-10 14:55:52 +01:00