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

41908 Commits (f61474fe5b3bd616fdd2d92fbb3478891bb60fb1)

Author SHA1 Message Date
Dave Houlton f61474fe5b DRTVWR-440, quick fix, add return value - needed for Mac build 2020-03-27 11:24:22 -06:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Andrey Kleshchev a7849c6ec4 Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
Dave Parks 964597af05 Merged in davep/DRTVWR-440 (pull request #48) 
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
 2020-03-26 22:00:54 +00:00
Runitai Linden d756e18573 SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values. 2020-03-26 16:48:33 -05:00
Dave Houlton a248018d6d Merged in euclid_gDebugGL_inf_loop (pull request #46) 
Fix infinite loop debug message when debugGL flag is enabled.

Approved-by: Michael Pohoreski
 2020-03-26 16:25:53 +00:00
Dave Houlton 126b91f8ee DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy 2020-03-26 10:24:25 -06:00
Dave Parks c7a2c9564e Merged in davep/DRTVWR-440 (pull request #47) 
Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl
 2020-03-25 20:30:33 +00:00
Runitai Linden 9e0cf3edaa Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl 2020-03-25 15:29:11 -05:00
Dave Parks 5e7271cc6b Merged in davep/DRTVWR-440 (pull request #45) 
Davep/DRTVWR-440
 2020-03-24 18:46:08 +00:00
Runitai Linden 20e5ad48ec Merge cleanup 2020-03-24 13:44:40 -05:00
Runitai Linden cbe8344279 Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/DRTVWR-440 2020-03-24 11:58:31 -05:00
Runitai Linden 3d22273726 Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF 2020-03-24 11:22:01 -05:00
Runitai Linden 3e472948db WIP - Make EEP match production. 2020-03-20 16:50:37 -05:00
Michael Pohoreski 1370c6d0c0 Merged in SL-11589 (pull request #44) 
SL-11589

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-19 17:16:43 +00:00
Michael Pohoreski 34fe06290a Merged in SL-12574_tweak_brightness (pull request #43) 
SL-12574 tweak brightness

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-19 17:14:31 +00:00
Ptolemy cbc3c51daf SL-11589 Remove redundant setting vary_texcoord0, cleanup grouping 2020-03-19 01:09:12 -07:00
Ptolemy 4bffb6e793 SL-11589 Fix clouds drooping below horizon 2020-03-19 00:57:18 -07:00
Ptolemy e466ab255d SL-12574 Cleanup unused final_atten 2020-03-18 23:37:47 -07:00
Ptolemy 03e0549d57 SL-12574 Fix environmentMap being too dark on EEP 2020-03-18 23:37:47 -07:00
Ptolemy bb99e50b26 SL-12574 Add note about duplicated procedurally generated sky texture 2020-03-18 23:37:47 -07:00
Dave Houlton a817232398 Merged in euclid_SL-12865 (pull request #42) 
SL-12865, add bias to alpha mask values to avoid 8-bit acne

Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
 2020-03-19 06:16:56 +00:00
Dave Houlton ff683a7127 SL-12865, add bias to alpha mask values to avoid 8-bit acne 2020-03-18 17:30:41 -06:00
Dave Houlton eb45c05466 Merged in DRTVTW-440_rel-merge_6.3.9 (pull request #41) 
Merge master (release 6.3.9) into DRTVWR-440
 2020-03-18 23:27:09 +00:00
Dave Houlton 331f290f61 Merge master (v 6.3.9) into DRTVWR-440 2020-03-18 15:39:38 -06:00
Nat Goodspeed 328329fcea Increment viewer version to 6.3.9 
following promotion of DRTVWR-481
 2020-03-18 14:20:02 -04:00
Dave Houlton 332232c532 Merged in euclid_SL-10449 (pull request #40) 
SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler
 2020-03-17 20:33:34 +00:00
Dave Houlton 6dbc72df77 SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler 2020-03-17 14:02:05 -06:00
Michael Pohoreski efd69ead5e Merged in SL-12574_tweak_brightness (pull request #39) 
SL-12574: Tweak sky cubemap to not be as dark to better match Windlight

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-17 15:45:52 +00:00
Andrey Kleshchev e85fe64a56 SL-12858 Fixed bad merge 2020-03-17 16:38:55 +02:00
Ptolemy 49239e8fe1 SL-12574: Tweak sky cubemap to not be as dark to better match Windlight 2020-03-16 19:44:54 -07:00
Dave Parks 6ce83f92b7 Merged in davep/DRTVWR-440 (pull request #38) 
Add missing fullbrightAtmosTransportFrag stub.
 2020-03-16 17:14:44 +00:00
Runitai Linden 8c1b9d3e7a Add missing fullbrightAtmosTransportFrag stub. 2020-03-16 12:10:34 -05:00
Dave Parks 223d9d143e Merged in davep/DRTVWR-440 (pull request #36) 
SL-12005 Fix for projectors getting brighter when switching to single light shader.
 2020-03-13 21:41:01 +00:00
Runitai Linden 5f0303eea5 SL-12005 Fix for projectors getting brighter when switching to single light shader. 2020-03-13 16:39:58 -05:00
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