Marc Zinnschlag
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
Marc Zinnschlag
896c7d9fa5
Merge remote branch 'scrawl/batching2'
2012-03-05 10:54:55 +01:00
Marc Zinnschlag
e7fa1d94b8
Merge remote branch 'scrawl/shapefix'
2012-03-05 10:51:18 +01:00
scrawl
42a7375a0b
adjusted the batch region size, this was the cause for lights going on/off bug
2012-03-04 23:26:35 +01:00
scrawl
ff8f95fcca
fix batch lighting, removed the "bumping number of lights" hack
2012-03-04 23:18:40 +01:00
scrawl
8910b0d471
use shaders for all NIF materials. this has numerous advantages:
...
- vertex colours are now working as they should (and they have a huge impact on the look)
- the lighting is per pixel and looks a lot better
- by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +01:00
Jason Hooks
a81ecb5f65
Bug 210 fix
2012-03-03 18:26:11 -05:00
scrawl
d74b78a302
very minor performance improvement
2012-03-03 12:26:08 +01:00
scrawl
ba0365a427
collision shape scale fix
2012-03-02 16:47:39 +01:00
Marc Zinnschlag
1e998545c7
fixed log path
2012-03-02 15:15:44 +01:00
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
Marc Zinnschlag
ed0fa255b0
Merge remote branch 'scrawl/weather' into next
2012-02-28 23:33:22 +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
4c2fffdd61
temporarily disabled multi data path support in OpenMW
2012-02-28 09:27:35 +01:00
Marc Zinnschlag
2c20aeab90
Merge remote branch 'werdanith/activationsounds' into next
2012-02-27 18:24:33 +01:00
Michael Papageorgiou
fe977fe313
More container and door trap fixes
2012-02-27 16:59:45 +02:00
Michael Papageorgiou
28fdfb0f99
Added container locked and trapped activation sounds
2012-02-27 16:37:05 +02:00
Marc Zinnschlag
739870489a
Merge remote branch 'scrawl/weather' into weather
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-02-27 15:02:03 +01:00
scrawl
c9ceb74e5c
transition fix
2012-02-27 12:21:00 +01:00
Michael Papageorgiou
c6861ed2a9
Added door activation sounds
2012-02-27 09:39:35 +02:00
Jason Hooks
36e9322830
a few changes2
2012-02-26 21:43:04 -05:00
Jason Hooks
8d7a5f469b
a few changes
2012-02-26 21:27:54 -05: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
528cff5a59
implemented ChangeWeather script function
2012-02-26 11:51:02 +01:00
scrawl
a05ba97382
choose a random weather depending on region's weather probabilities
2012-02-25 23:41:02 +01:00
scrawl
d77d5080bd
implemented GetCurrentWeather script function
2012-02-25 21:34:38 +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
Marc Zinnschlag
771d50fe69
removed a redundant assert and a left-over comment
2012-02-24 20:20:32 +01:00
Marc Zinnschlag
68da94c8f0
workaround for older boost versions
2012-02-24 20:19:32 +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
Jason Hooks
08f3ecf935
Slightly better performance on animation2
2012-02-24 01:30:17 -05:00
Jason Hooks
fb51b281b2
Slightly better performance on animation
2012-02-24 01:16:30 -05: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
Marc Zinnschlag
26bd2be1e8
Merge branch 'equipment' into next
2012-02-23 13:02:20 +01:00