summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2022-07-01SL-17682: PBR: Fix irradiance to use amblitPtolemy
2022-07-01SL-17682: Cleanup GGX flagsPtolemy
2022-06-30SL-17640 Handle unsaved changes betterAndrey Kleshchev
2022-06-30Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-30SL-17682: Fix diffuse, and emissive being in sRGB which also fixes fresnelRPtolemy
2022-06-30SL-17640 Use LLAgentBenefitsMgr for upload costAndrey Kleshchev
2022-06-29Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-29SL-17685 Add missing filesDave Parks
2022-06-29SL-17685 Drag and drop material supportDave Parks
2022-06-29SL-17274: PBR: Add spec weight debuggingPtolemy
2022-06-29SL-17274: PBR: Group diffuse debuggingPtolemy
2022-06-29SL-17274: PBR: Fix EMS being zero when using GGX approximationPtolemy
2022-06-29SL-17274: PBR: Add c_diff and fix kDiffusePtolemy
2022-06-29Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-29SL-17685 Drag and drop material support WIPDave Parks
2022-06-29Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-29SL-17274: Cleanup order of diffuse debug flagsPtolemy
2022-06-29SL-17274: Add reflection dir debuggingPtolemy
2022-06-29SL-17274: Fix typoPtolemy
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-29SL-17602 WIP - Texture uploads form material editor now work but the names ↵Dave Parks
are garbage and the resulting material asset has the wrong UUIDs
2022-06-29SL-17274: Simplify occlusion and make not about future occlusion_strengthPtolemy
2022-06-29SL-17274: Fix typo in reference to SL-14035Ptolemy
2022-06-29Increment viewer version to 6.6.2Nat Goodspeed
following promotion of DRTVWR-543
2022-06-28Fix for 2-bit errors in writing to and reading from norm.wDave Parks
2022-06-28SL-17274: PBR: Cleanup alignmentPtolemy
2022-06-28SL-17274 PBR: Cleanup: Alphabetize and categorize debugging flagsPtolemy
2022-06-28SL-17274: PBR: Cleanup: Put primary channels ↵Ptolemy
Diffuse,Emissive,Metal,Occlusion,Roughness first
2022-06-28SL-17274: PBR: Fix reflectionPtolemy
2022-06-28SL-17274: PBR: Add EmissivePtolemy
2022-06-28Add emissiveRect to softenLightF.glslDave Parks
2022-06-28Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-28SL-17274: PBR: Add occlusionPtolemy
2022-06-28SL-17274: PBR: Add kSpec debuggingPtolemy
2022-06-28SL-17274: PBR: Cleanup dot() vertex2cameraPtolemy
2022-06-28SL-17274: PBR: Add kDiffuse debuggingPtolemy
2022-06-28SL-17274: PBR: Remove manual debugPtolemy
2022-06-28SL-17274: PBR: Add reflect0 debuggingPtolemy
2022-06-28SL-17274: PBR: Add reflection vecPtolemy
2022-06-28SL-17274: PBR: Move amblit to before PBR shadingPtolemy
2022-06-28SL-17274: PBR: Cleanup: Only calc reflectance if debuggingPtolemy
2022-06-27SL-17274: PBR: Fix IORPtolemy
2022-06-27SL-17274: Cleanup positionPtolemy
2022-06-27SL-17274: PBR: Fix v, dotTV, dotBVPtolemy
2022-06-27SL-17274: Cleanup incorrect emissive commentPtolemy
2022-06-27Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-27SL-17274: Document which shader encodesNormal includesPtolemy
2022-06-27Continuing progress on SL-17602 inventory support for Materials. now have ↵Brad Kittenbrink
working inventory bridge implementations