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

41843 Commits (61697e8e7a101d94eec25b0df8a02e19c77d02c8)

Author SHA1 Message Date
Michael Pohoreski 61697e8e7a Merged in SL-12781 (pull request #32) 
SL-12781

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-13 21:11:06 +00:00
Dave Houlton 0ac71ec5e3 Merged in euclid_SL-12784 (pull request #35) 
SL-12784 disambiguate vertex_color.a of 0
 2020-03-13 21:09:24 +00:00
Dave Houlton 09b13b3981 SL-12784 disambiguate vertex_color.a of 0 2020-03-13 15:00:18 -06:00
Michael Pohoreski 48c5e7ae4c Merged in SL-12850 (pull request #34) 
SL-12850

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-13 19:38:12 +00:00
Ptolemy 3792c3c7de SL-12850 Adhere to coding standard 2020-03-13 12:37:14 -07:00
Ptolemy bedbbdc5c3 SL-12850 remove debug 2020-03-13 12:35:12 -07:00
Ptolemy 744872b43d SL-12850 2020-03-13 11:46:13 -07:00
Dave Parks 4034d57bb8 Merged in davep/DRTVWR-440 (pull request #33) 
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
 2020-03-13 18:12:14 +00:00
Runitai Linden 0a0cfcf2ef SL-12233 Fix for disagreement between fullbright implementations with ALM on and off. 2020-03-13 12:58:47 -05:00
Ptolemy 2b0b3e8625 SL-12781 Remove expensive and redundant z clear; instead enable/disable z test for background and model preview 2020-03-12 18:58:59 -07:00
Ptolemy b67df8184f SL-12781 Cleanup: Remove HACK / MAGIC NUMBER effective constant of mCameraDistance as it is set in setPreviewTarget() via initModelPreview() 2020-03-12 18:58:59 -07:00
Ptolemy fe4549c950 SL-12781 Cleanup: Rename non-descript generic var name 2020-03-12 18:58:59 -07:00
Ptolemy 36499c7526 SL-12781 Cleanup: Update out-of-date color comment 2020-03-12 18:58:59 -07:00
Ptolemy 6708b382ac SL-12781 Fix Upload 3D Preview not using z-buffer 2020-03-12 18:58:59 -07:00
Dave Houlton f840297e3d Merged in euclid_SL-12784 (pull request #31) 
SL-12784 restore vertex color alpha contribution
 2020-03-12 23:08:11 +00:00
Dave Houlton c7f2712d95 SL-12784 restore vertex color alpha contribution 2020-03-12 16:52:48 -06:00
Dave Houlton 23953e416e DRTVWR-440 fix 'unreachable code' warning-as-error when buildin /Od 2020-03-12 13:22:32 -06:00
Andrey Lihatskiy 56dcbc3cf1 Merged in SL-12779 2020-03-10 23:58:28 +00:00
Michael Pohoreski 1b8dab78a8 Merged in SL-12171_srgb_linear_fix (pull request #29) 
SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanup
 2020-03-10 22:40:59 +00:00
Andrey Lihatskiy 13c8496799 SL-12779 [EEP] Fix for cropped buttons in 'Edit Day Cycle' floater 2020-03-10 23:29:32 +02:00
Ptolemy b1e2615cd8 SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanup 2020-03-10 12:35:12 -07:00
Dave Houlton 40526d5489 Merged in SL-12592 (pull request #28) 
SL-12592 prevent unintended opaque-ification of alpha-blended materials
 2020-03-10 18:21:19 +00:00
Dave Houlton 7d94bcf729 DRTVWR-440 Add compile switch SHADER_CRASH_NONFATAL to prevent app exit on shader failure 2020-03-10 12:01:24 -06:00
Dave Houlton f9eada575b SL-12592, avoid light modulation of fullbright and preserve diffuse alpha component 2020-03-10 12:01:24 -06:00
Michael Pohoreski 59da175ae8 Merged in SL-12574_srgb_linear_fix (pull request #26) 
SL-12574 Fix EEP cubemap not matching non-EEP for both ALM on and off

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-10 16:51:06 +00:00
Ptolemy d32821ea5b SL-12574 Fix EEP cubemap not matching non-EEP for both ALM on and off 2020-03-06 17:20:46 -08:00
Dave Parks 3c5888e325 Merged in davep/BUG-228263 (pull request #25) 
Fix for mismatch on angular attenuation between sunlight on opaque and transparent objects from last commit.
 2020-03-06 20:34:32 +00:00
Runitai Linden 0390dc2fec Fix for mismatch on angular attenuation between sunlight on opaque and transparent objects from last commit. 2020-03-06 14:33:58 -06:00
Runitai Linden f0a9b6c01b Fix for sunlight having improper gamma curve for angular attenuation. Fix for lack of angular attenuation on ambient lighting on triangles facing away from sun. 2020-03-06 14:27:46 -06:00
Dave Parks ce8bf1a3f3 Merged in davep/BUG-228263 (pull request #24) 
Fix for sky in wrong color space.
 2020-03-06 19:55:06 +00:00
Runitai Linden a3759b4910 Fix for sky in wrong color space. 2020-03-06 13:54:27 -06:00
Dave Parks fd043095c6 Merged in davep/BUG-228263 (pull request #23) 
Davep/BUG-228263

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-06 17:30:55 +00:00
Runitai Linden 7d0cf70e4f Fix for under water being much brighter and mismatching between alpha and deferred. Don't make terrain fullbright under water. 2020-03-06 11:05:55 -06:00
Runitai Linden ecf8c6f520 Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/BUG-228263 2020-03-06 09:11:44 -06:00
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
Maxim Nikolenko c1a3797b30 Merged in fix for SL-9775 2020-03-05 20:19:47 +00: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
maxim_productengine edb4373f7d SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing parcel media) 2020-03-05 14:13:39 +02: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