livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,036 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

40036 Commits (2a740309d01ca2ab80fd054ea8d8a79fb7ebbbe0)

Author SHA1 Message Date
Rider Linden 2a740309d0 SL-10406, SL-10464: Experience injections now have their own sub class of day instance (DayInjection) Montitors underlying environments and switches the sources as needed. 2019-02-11 16:50:15 -08:00
Rider Linden ce40f88ecb Better calculation of time remaining in span for track animator (from SL-10465) 2019-02-05 15:09:32 -08:00
Rider Linden 801ce79b72 Merged in andreykproductengine/maint-eep (pull request #264) 
SL-10279 Use stored environment instead of region one

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
 2019-02-05 20:54:54 +00:00
andreykproductengine a19d7c92b5 temp fog 2019-02-05 22:14:35 +02:00
Graham Linden e17756e700 SL-10443 
Make fix which gets 10276 and 10443, but leaves the bizarre flip at the zenith
so that the sun/moon textures are always upright w.r.t the viewer.
 2019-02-05 11:13:09 -08:00
Graham Linden 910de30489 SL-10304 
Fix panel_settings_water increments for Underwater Modifier and wave directions.
 2019-02-05 10:07:30 -08:00
andreykproductengine b5a7874ba5 SL-10279 Use stored environment instead of region one 2019-02-05 15:30:06 +02:00
Rider Linden db01f4bb2b Merged in graham_linden/viewer-eep-fixes (pull request #263) 
SL-10459, SL-10461
 2019-02-04 21:32:57 +00:00
Graham Linden 9a007cceef SL-10461 
Pass projector ambiance as the .w element of the light_attenuation uniform
so that alpha shader can emulate the behavior of proper spot projectors.
 2019-02-04 12:56:11 -08:00
Graham Linden 1d1fcb451c SL-10459 
Use gl_FragDepth on deferred sun disc to fix z-fighting with sky dome and get layering of sky/stars/sun/moon/clouds correct.
 2019-02-04 10:22:55 -08:00
maxim_productengine 0b5c452fd9 SL-9698 Restore code line after the merge 2019-02-04 13:40:42 +02:00
Rider Linden 6eb180f790 Merged in graham_linden/viewer-eep-fixes (pull request #261) 
SL-9996, SL-1130, SL-5546
 2019-02-01 21:53:44 +00:00
Graham Linden 8b4a86db29 Remove MSVC pragma to make debugging feasible in RelWithDebInfo. 2019-02-01 13:43:49 -08:00
Graham Linden 5a8610ccb7 SL-9996, SL-1130, SL-5546 
Fix bug with setting texture matrix for rigged mesh.

Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth.

Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning
(we can no longer depend on them being mutex to each other).
 2019-02-01 13:41:31 -08:00
Rider Linden e1627330c9 Merged in graham_linden/viewer-eep-fixes (pull request #259) 
Fix for OSX shader compiler knock-on
 2019-02-01 18:03:14 +00:00
Graham Linden 6716e543a1 Remove one more piece of attempted 9996 fix on ALM. 2019-02-01 09:53:36 -08:00
Graham Linden db97bb5148 Roll back attempted fix for 9996 on ALM which has unacceptable knock-on effects. 2019-02-01 09:49:55 -08:00
Graham Linden 50b383e5aa Fix issue with OSX shader compiler not implementing #if correctly (nice job, Timmy). 2019-02-01 09:45:07 -08:00
andreykproductengine 23193e92d3 SL-9851 Adjust UI limits 2019-02-01 18:49:59 +02:00
Rider Linden 45e291bfdf Merged in andreykproductengine/maint-eep (pull request #254) 
SL-1531 Hover highlight should be consistent with mouse selection
 2019-02-01 16:43:46 +00:00
maxim_productengine fcf25b690f SL-10364 FIXED Parcel Sky Altitudes not set correct when opening About Land -> Environment for the first time upon region arrival 2019-02-01 18:33:55 +02:00
andreykproductengine b7a1b499fd SL-1531 Hover highlight should be consistent with mouse selection 2019-02-01 15:03:02 +02:00
Rider Linden 2456715a40 Merged in graham_linden/viewer-eep-fixes (pull request #253) 
SL-10443, SL-9994, SL-10374, SL-10081
 2019-01-31 23:06:53 +00:00
Graham Linden f1ee481b82 SL-10443 
Fix sun/moon disc geo generation reversing the UVs of the images for same.

Remove comment about voidwater when depth clamp is unavailable as it no longer applies.
 2019-01-31 14:48:35 -08:00
Rider Linden 29e8215faa Merged in andreykproductengine/maint-eep (pull request #252) 
SL-1531 Mac build fix
 2019-01-31 19:24:35 +00:00
Graham Linden 52e1c6dd0e Merge 2019-01-31 11:01:30 -08:00
Graham Linden abaa64067f Remove (now) unused decodeNormF GLSL shader. 2019-01-31 11:01:13 -08:00
andreykproductengine 7469fdba80 SL-1531 Mac build fix 2019-01-31 20:25:56 +02:00
Graham Linden 767fb53aeb 9996 partial fix (works for non-ALM rendering only) 
Use a new edge water shader to allow forcing frag depth to avoid z-fighting at back edge of water edge pieces.

This will not work for ALM because forcing the depth breaks the use of the depth to backproject gbuffer position which breaks lighting calcs.
 2019-01-31 09:56:37 -08:00
Rider Linden fc5f897a1d Merged in maxim_productengine/viewer-eep (pull request #249) 
SL-10279 Update altitude value after slider correction

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
 2019-01-31 17:45:10 +00:00
andreykproductengine aec5fc3607 SL-9924 EEP Environment Settings permissions can be dropped by Save As button 2019-01-31 18:45:37 +02:00
andreykproductengine 531ad5b3ec SL-1531 EEP Visual feedback on the timeline 2019-01-31 18:45:01 +02:00
andreykproductengine 0e3f64bd85 SL-1932 EEP messed up flag 2019-01-31 16:12:42 +02:00
maxim_productengine 462281b7f5 SL-10279 Update altitude value after slider correction 2019-01-31 14:50:24 +02:00
Rider Linden afe5578315 Merge 2019-01-30 14:37:24 -08:00
Rider Linden c7e02b0835 SL-9925: Viewer now shows an error message if import from legacy windlight fails. 2019-01-30 14:36:46 -08:00
Graham Linden 695490d41b Make shadow map gen shaders not link against shadowUtil module so Intel HD x000 compiler can get under it's Yugo-like allotment of texture units. 2019-01-30 14:08:58 -08:00
Graham Linden dddbc96f98 Reduce shadow shader linkage of deferredUtil module to try to get Intel HD x000 compiler to link again. 2019-01-30 13:55:54 -08:00
Graham Linden deb6110098 Eliminate helper GLSL modules depending on further GLSL modules to give Intel HD x000 compiler a fighting chance. 
More WIP for edge-specific water shader for 9996.
 2019-01-30 13:26:35 -08:00
Graham Linden 08440def11 WIP for 10374 (reduce number of shaders linking against deferredUtil). 
Prepare for using ifdef to conditionally engage using gl_FragDepth in water shaders
(because GL requires that writing to gl_FragDepth on any path means you need to
 write a depth value on every path).
 2019-01-30 12:34:20 -08:00
andreykproductengine 16b47db736 SL-10279 Remake altitude 'bumping' 2019-01-30 21:51:59 +02:00
Graham Linden bd25688867 SL-9996 
Force frag depth in water shaders to avoid z-fighting at back edge of water edge pieces.
 2019-01-30 10:38:41 -08:00
Graham Linden 12cd42221e SL-10416 
Replace hope and asserts with checks in LLFace::setTexture in hopes of side-stepping media texture crash.
 2019-01-30 08:54:29 -08:00
Graham Linden acbc7f4cdd SL-10415, SL-10434 
Further tweaking of directional shadow sampling to balance between peter-panning and shadow acne.

Move stars to just this side of the sky some to reduce parallax.

Remove decodeNormF and uses of decode_normal in favor of unified use of getNorm
(try to help the Intel HD x000 compiler learn to link correctly).
 2019-01-30 08:37:07 -08:00
andreykproductengine 17a4093223 SL-10279 Validate altitude input 2019-01-30 16:29:46 +02:00
Rider Linden baebf981ac Merged in graham_linden/viewer-eep-fixes (pull request #247) 
SL-10415, SL-10434, SL-10416
 2019-01-30 17:33:16 +00:00
maxim_productengine c8a79a59c9 SL-10360 Show "Region environment" text for tracks if there is no parcel environment used. 2019-01-30 18:05:27 +02:00
Rider Linden 1e1e759a79 Merged in graham_linden/viewer-eep-fixes (pull request #244) 
Roll back fix for 10415 :(
 2019-01-30 00:39:03 +00:00
Graham Linden 38f6953378 Roll back fix for 10415 due to knock-on that must needs be tamped down. 2019-01-29 16:18:16 -08:00
Rider Linden 51fe738aaf Merged in graham_linden/viewer-eep-fixes (pull request #243) 
SL-10303, SL-10414, SL-10415, SL-10424, SL-10381
 2019-01-29 18:25:20 +00:00