Commit Graph

42139 Commits (8b8a57a977a407dc1fda052d6a6289b5800f48e8)

Author SHA1 Message Date
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
Andrey Kleshchev 4b62779fd3 SL-12562 Change events URL 2020-03-04 14:58:55 +02:00
Andrey Lihatskiy afd45506c1 SL-12792 Made "save as a new preset" a default option 2020-03-04 05:31:22 +02: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
Brad Payne (Vir Linden) e4a8942843 SL-12757 - typo in menu_viewer.xml 2020-02-25 18:56:11 +00: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
Andrey Lihatskiy 6b283f166b Merge branch 'master' into DRTVWR-460 2020-02-22 18:45:06 +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
Andrey Kleshchev bfcb558f90 SL-12678 Remove automatic retry of login 2020-02-21 23:38:39 +02:00
Brad Payne (Vir Linden) 05e2efb283 SL-10498 - made benefits debug output a bit less verbose 2020-02-21 19:56:44 +00:00
Dave Houlton 7674c00fb9 Merge master (v 6.3.8) into DRTVWR-440 2020-02-21 12:05:46 -07:00
Andrey Kleshchev c5371bb271 SL-12732 Lights not working in some cases 2020-02-21 18:51:14 +02:00
Brad Payne (Vir Linden) c9305c1e49 merge 2020-02-21 15:36:59 +00:00
Andrey Lihatskiy 4ac03d4905 Merge branch 'master' into DRTVWR-500 2020-02-21 03:29:51 +02: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
Andrey Kleshchev 961f826fee SL-12198 Updated VVM - fixed .done file removal 2020-02-17 16:06:43 +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
Andrey Kleshchev 88ae7dcb29 SL-12678 Remove automatic retry of login 2020-02-12 17:30:30 +02:00
Andrey Kleshchev fbabec1ceb SL-12616 Updated VVM
Cancelable updates should not be installed if user quit without confirmation, ask again later
2020-02-12 16:07:14 +02:00
Andrey Kleshchev 8644aa1f81 SL-11932 Updated VVM #2
Previous update handled case of user terminating updater on 'precheck', new one works for updater termination on 'leap'
2020-02-11 21:37:03 +02:00
Andrey Kleshchev 50c05006e7 SL-11932 Updated VVM 2020-02-11 19:57:29 +02:00
maxim_productengine 95992bd1a2 SL-12621 Remove inappropriate tooltip 2020-02-11 14:25:53 +02:00
maxim_productengine a5c1ae9faf SL-12621 Add CameraOffsetScale option to "Precise Controls" floater 2020-02-10 16:43:21 +02: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 Lihatskiy ad63fa5ffa Merge branch 'master' into DRTVWR-460 2020-02-05 18:30:40 +02:00
Andrey Kleshchev 89d1bf39c5 SL-4354 Not loaded avatars should stay cloud longer 2020-02-05 16:16:39 +02:00