summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-20Increment viewer version to 6.4.1Nat Goodspeed
following promotion of DRTVWR-440
2020-04-14SL-13019, fix broken varying linkage on MacOSDave Houlton
2020-04-13SL-13029 Fixed load orderAndrey Kleshchev
2020-04-12SL-13029 Environment update was not applying properlyAndrey Kleshchev
2020-04-09SL-12975, unfix alpha and undo non-fix magic number of refracted portion of ↵Dave Houlton
water Fresnel
2020-04-07SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders compDave Houlton
2020-04-07SL-10449 Fix ALM on OSXPtolemy
2020-04-03SL-11368, fix missing water uniforms for low shader settingsDave Houlton
2020-04-03SL-12852 Cleanup for readabilityPtolemy
2020-04-01Merged in eep-fix-falloff-edit (pull request #54)Rye Mutt
Fix light falloff being corrupted when editing value via build floater spinner Approved-by: Dave Houlton
2020-04-01Merged in eep-fix-light-color (pull request #53)Rye Mutt
Fix editing light color corrupting intensity and color values Approved-by: Dave Houlton
2020-03-30Update falloff fix with changes requested in review.Rye Mutt
2020-03-30SL-12888 Fix space alpha megaprim not using z-testPtolemy
2020-03-30Fix light falloff being corrupted when editing value via build floater spinnerRye Mutt
2020-03-30Fix editing light color corrupting intensity and color valuesRye Mutt
2020-03-27Merged in davep/DRTVWR-440 (pull request #52)Dave Parks
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
2020-03-27SL-12902 Better fix for light color values in color swatch not matching ↵Runitai Linden
light color values inworld.
2020-03-27SL-12911 Add Debug setting EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-03-27Removed obsolete and misleading variableAndrey Kleshchev
2020-03-26SL-12902 Fix for doing the technically correct but compatibility wrong thing ↵Runitai Linden
WRT light color values.
2020-03-25Fix for class2/softenLightF.glsl not matching class1/softenLightF.glslRunitai Linden
2020-03-24Merge cleanupRunitai Linden
2020-03-24Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/DRTVWR-440
2020-03-24Fix for bad fullbright shiny shininess values and inconsistency between ↵Runitai Linden
materialF and fullbrightShinyF
2020-03-20WIP - Make EEP match production.Runitai Linden
2020-03-19Merged in SL-11589 (pull request #44)Michael Pohoreski
SL-11589 Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-19SL-11589 Remove redundant setting vary_texcoord0, cleanup groupingPtolemy
2020-03-19SL-11589 Fix clouds drooping below horizonPtolemy
2020-03-18SL-12574 Cleanup unused final_attenPtolemy
2020-03-18SL-12574 Fix environmentMap being too dark on EEPPtolemy
2020-03-18SL-12574 Add note about duplicated procedurally generated sky texturePtolemy
2020-03-18SL-12865, add bias to alpha mask values to avoid 8-bit acneDave Houlton
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-03-18Increment viewer version to 6.3.9Nat Goodspeed
following promotion of DRTVWR-481
2020-03-17SL-10449 remove soft gamma adjustment that breaks Mac GLSL compilerDave Houlton
2020-03-17Merged in SL-12574_tweak_brightness (pull request #39)Michael Pohoreski
SL-12574: Tweak sky cubemap to not be as dark to better match Windlight Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-17SL-12858 Fixed bad mergeAndrey Kleshchev
2020-03-16SL-12574: Tweak sky cubemap to not be as dark to better match WindlightPtolemy
2020-03-16Add missing fullbrightAtmosTransportFrag stub.Runitai Linden
2020-03-13Merged in davep/DRTVWR-440 (pull request #36)Dave Parks
SL-12005 Fix for projectors getting brighter when switching to single light shader.
2020-03-13SL-12005 Fix for projectors getting brighter when switching to single light ↵Runitai Linden
shader.
2020-03-13Merged in SL-12781 (pull request #32)Michael Pohoreski
SL-12781 Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-13SL-12784 disambiguate vertex_color.a of 0Dave Houlton
2020-03-13SL-12850 Adhere to coding standardPtolemy
2020-03-13SL-12850 remove debugPtolemy
2020-03-13SL-12850Ptolemy
2020-03-13Merged in davep/DRTVWR-440 (pull request #33)Dave Parks
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
2020-03-13SL-12233 Fix for disagreement between fullbright implementations with ALM on ↵Runitai Linden
and off.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:42:20 +0000