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

41807 Commits (7c7d71269f5b47397d14bbe44e341e4ac1d96889)

Author SHA1 Message Date
Runitai Linden 7c7d71269f WIP - Windlight sun lighting should happen in sRGB space, not linear space. This keeps ambient from getting overblown and better matches environment lighting with ALM on/off. 2020-03-05 16:28:06 -06:00
Dave Parks 90ad38db06 Merged in davep/BUG-228263 (pull request #21) 
Davep/BUG-228263
 2020-03-05 18:00:14 +00:00
Runitai Linden d33655828c Reenable water fog in materialF.glsl (oops) 2020-03-05 11:58:58 -06:00
Runitai Linden ca5cc79dfb Fix line endings? 2020-03-04 16:43:18 -06:00
Runitai Linden 265cefd262 Merge fix 2020-03-04 16:38:37 -06:00
Runitai Linden 40123cfc53 Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/BUG-228263 2020-03-04 16:30:02 -06:00
Runitai Linden 1481d78bb2 Changes somehow missing from last commit 2020-03-04 16:23:31 -06:00
Runitai Linden cc5044bce0 WIP - fix various inconsistencies in sRGB vs linear color space. Fix inconsistencies between softenLightF.glsl, materialF.glsl, and alphaF.glsl 2020-03-04 15:56:02 -06:00
Dave Houlton d2120bb281 Merged in BUG-228263 (pull request #20) 
BUG-228263, roll back several PRs that broke alpha blending

Approved-by: Michael Pohoreski
 2020-03-04 19:52:50 +00:00
Dave Houlton 1ba0df9abe Roll back SL-12006 commits to materialF.glsl (Dec23) 2020-03-04 11:18:45 -07:00
Dave Houlton 8c2b7e0e83 Revert 2 merges (PR#13, PR#16) related to SL-12638 
This reverts commits 9d9b890 and 5f846e4.
 2020-03-03 17:16:00 -07:00
maxim_productengine c40dd9917f SL-11273 FIXED [EEP] The beacon checkboxes in the Day Cycle window can only be changed while a keyframe is selected. 2020-03-02 17:31:25 +02:00
Andrey Kleshchev 54ded36787 SL-12755 [EEP] The sky level dropdown is not disabled for folders 2020-03-02 15:34:38 +02:00
Dave Houlton 5f846e4229 Merged in SL-12638 (pull request #16) 
SL-12638, further tweaking of normal-map lighting, add some de-saturation
 2020-02-28 19:37:42 +00:00
Dave Houlton 823d8bce60 SL-12638, further tweaking of normal-map lighting, add some de-saturation 2020-02-28 12:35:36 -07:00
maxim_productengine 44f0cadad8 SL-12739 FIXED [EEP] Viewer is crashed after clicking the "Forget" button on the Experience Profile after the llSetAgentEnvironment was used 2020-02-27 15:30:09 +02:00
Michael Pohoreski 735859c76e Merged in SL-12574 (pull request #14) 
SL-12574

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-02-26 00:04:23 +00:00
Ptolemy c4c8d20174 SL-12574 Tweak sky to better match Windlight 2020-02-25 13:25:15 -08:00
Ptolemy d87cc68a72 SL-12574 Cleanup inconsistent indentation 2020-02-25 13:25:15 -08:00
Ptolemy b71e33b48c SL-12574 Cleanup unused argument 2020-02-25 13:25:15 -08:00
Ptolemy d180e94a86 SL-12574: Document shader class summary 2020-02-25 13:25:15 -08:00
Ptolemy 22ec67975c SL-12574: Simplify Direct Ambient 2020-02-25 13:25:15 -08:00
Dave Houlton 9d9b8901e4 Merged in SL-12638 (pull request #13) 
SL-12638, fix overly dark appearance of normal-mapped objects

Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
 2020-02-25 18:52:11 +00:00
Dave Houlton 2ea5075269 SL-12638, fix overly dark appearance of normal-mapped objects 
Adds the 'additive' component of calcAtmosphericVars into the sunlit color to reduce
darkening of sun lighting component, and adds a further magic number gainto boost
final result to rough parity with windlight.

Removes all light calculations on fullbright objects, just passing through the unlit
diffuse color.
 2020-02-25 11:50:20 -07:00
Andrey Kleshchev dbf464e0fd SL-12754 Fixed search field 2020-02-25 20:43:15 +02:00
Andrey Kleshchev b1934b4d05 SL-12755 [EEP] The sky level dropdown was not disabled by default 2020-02-25 20:23:12 +02:00
Andrey Kleshchev db2c32285b SL-12591 Fixed slider value comparison 2020-02-25 20:13:05 +02:00
Andrey Kleshchev d16a79fc4c SL-12741 Moon was using fixed color 2020-02-24 21:22:21 +02:00
Dave Houlton 7f1b4b22e6 Merge master (rel 6.3.8) to DRTVWR-440 (pull request #11) 2020-02-21 23:22:40 +00:00
Dave Houlton 7674c00fb9 Merge master (v 6.3.8) into DRTVWR-440 2020-02-21 12:05:46 -07:00
Nat Goodspeed 2c4133c8db Increment viewer version to 6.3.8 
following promotion of DRTVWR-499
 2020-02-20 19:37:33 -05:00
Andrey Kleshchev 01d4fd2451 SL-12726 Fixed overlap issues in Edit Day Cycle floater 
Multiline support for current time, space for correct wrap; Fixed text getting out of bonds for labels; Space from time_label was not working;
 2020-02-19 21:20:22 +02:00
Michael Pohoreski 3e5c992698 Merged in SL-12574 (pull request #9) 
DRTVWR-440: SL-12574: Tweak environment cube map to better match Windlight

Approved-by: Dave Houlton
 2020-02-13 17:25:17 +00:00
Ptolemy 4be51fa559 DRTVWR-440: SL-12574: Tweak environment cube map to better match Windlight 2020-02-07 16:17:15 -08:00
Dave Houlton 90e3974b16 Merged in SL-12682 (pull request #8) 
Fixes for SL-12682 and SL-12592

Approved-by: Michael Pohoreski
 2020-02-07 22:46:46 +00:00
Dave Houlton 8e0d5f463e SL-12682, remove negative light & clean up materialF.glsl 2020-02-07 13:34:29 -07:00
Dave Houlton 54bd5ed5fa SL-12592, fix transparency for full-brights 2020-02-07 13:34:29 -07:00
Andrey Kleshchev 47622f0af6 Revert SL-4354 2020-02-05 03:54:01 +02:00
Dave Houlton 3adbc44a07 Merged in SL12005 (pull request #7) 
SL-12005 FIXED, back out SRGB changes for projector spotlights

Approved-by: Michael Pohoreski <ptolemy@lindenlab.com>
 2020-02-04 21:36:06 +00:00
Andrey Kleshchev a43b997c07 SL-4354 Used wrong condition 2020-02-04 22:41:55 +02:00
Dave Houlton c1652b4c42 SL-12005, back out SRGB changes for projector spotlights 
Deferred spotlights were transitioned srdb->linear in commit 653133b
The lights transition between the deferred and (some other) path at fixed camera
distance, causing a distinct light-level pop. Backing out this change to avoid
the pop. Note to the future: pick a light space at the beginning and stick with it.
 2020-02-04 10:45:05 -07:00
Dave Houlton 064864e5fb Merged in euclid-wip-SL12594 (pull request #5) 
SL-12594, missed occurance of VertexShaderEnable setting

Approved-by: Michael Pohoreski <ptolemy@lindenlab.com>
Approved-by: Bradley Payne <vir@lindenlab.com>
 2020-01-31 21:55:38 +00:00
Dave Houlton 87a21d8acc SL-12594, fix one missed occurance of VertexShaderEnable setting 2020-01-31 10:29:16 -07:00
Dave Houlton 701e851513 Merged in euclid-wip-SL12594 (pull request #3) 
SL-12594, Remove ability to de-select Basic Shaders (ie disable Fixed Function rendering)

Approved-by: Bradley Payne <vir@lindenlab.com>
Approved-by: Michael Pohoreski <ptolemy@lindenlab.com>
 2020-01-30 21:17:25 +00:00
Michael Pohoreski 01770f3ce3 Merged in SL-11406 (pull request #2) 
SL-11406: Fix specularity being blown out due to previous fix

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-01-30 19:55:05 +00:00
andreykproductengine 712164210c SL-4354 Mesh avatars look broken while loading. 2020-01-30 15:20:00 +02:00
Ptolemy 8545b81a32 SL-11406: Fix specularity being blown out due to previous fix 2020-01-29 15:21:05 -08:00
Dave Houlton 49a2b3b5d7 SL-12594, remove conditional checks for VertexShaderEnable settings 2020-01-29 14:46:47 -07:00
Dave Houlton c3ad61034c SL-12594, remove settings-file references to VertexShaderEnable 2020-01-29 14:45:37 -07:00
Dave Houlton a20a506bd1 SL-12594, rename some lingering VertexShaderEnable variables 2020-01-29 13:18:41 -07:00