summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2022-11-02Merged in SL-18485 (pull request #1183)Sabrina Shanman
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-02SL-18520 Fix for mac build.Dave Parks
2022-11-02SL-18485: Render GLTF materials with extension KHR_texture_transform with ↵Cosmic Linden
approprate texture transforms
2022-11-02SL-18531 Disable texture controls when editing face with materialAndrey Kleshchev
2022-11-02SL-18448 Make material editor's scroll smarterAndrey Kleshchev
2022-11-02Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-02SL-18520 Use GLTF material.extras to pass flags for enabling overriding ↵Dave Parks
alpha mode and double sided to default
2022-11-02SL-18522 Use naming consistent with GLTF standardAndrey Kleshchev
2022-11-01SL-18448 Fix metallic and normal controls being swappedAndrey Kleshchev
2022-11-01Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-11-01Increment viewer version to 6.6.8Nat Goodspeed
following promotion of DRTVWR-575
2022-11-01D559 MacOS build fixAndrey Kleshchev
2022-11-01SL-18448 Fixed exit conditionAndrey Kleshchev
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-11-01Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-01SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow ↵Dave Parks
overriding to default values.
2022-11-01Fix mac build for DRTVWR-559. PROFILE_ZONE_SCOPED macro cant take an argumentBrad Kittenbrink
2022-11-01SL-18391 Removed direct dependency of local materials onto tinygltfAndrey Kleshchev
2022-11-01SL-18513 Put profile markers around GLTF code.Dave Parks
2022-10-31SL-18448 Fix for mac build.Dave Parks
2022-10-31Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer ↵Brad Kittenbrink
both reasons at the same time
2022-10-31SL-18448 Do not show editor when saving material inworld, only a name promptAndrey Kleshchev
2022-10-31SL-18442 Port of Caladbolg's fix for emissive overrides not taking. Remove ↵Dave Parks
unused function.
2022-10-31Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-31SL-18483 Work around for crash on AMD when using glGenerateMipmap on cubemap ↵Dave Parks
array.
2022-10-31SL-18446 Don't cause excessive udpatesAndrey Kleshchev
2022-10-31SL-18446 Fix emissive tintAndrey Kleshchev
2022-10-31SL-18446 Material override arrival filteringAndrey Kleshchev
2022-10-29SL-18446 Material override arrival for selected objects should update ↵Andrey Kleshchev
material editor
2022-10-29SL-18448 Material Editor and Tools floater adjustmentsAndrey Kleshchev
1. Enable glow 2. Added buttons to texture->pbr
2022-10-28SL-18498 WIP -- Better handling of updates from server (don't null out ↵Dave Parks
overrides on updates from server unless material ID has changed)
2022-10-28Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-28SL-18493 Fix for viewer not sending material ID updates to simulator.Dave Parks
2022-10-29SL-17699 Hide pipette for material pickerAndrey Kleshchev
At the moment there is no specification how it should work, it can't work like it does for textures due to material overrides. Also removed some dead code
2022-10-28SL-17699 Blank material Id for material pickerAndrey Kleshchev
2022-10-28SL-18493 Fix for assert when setting override before material has arrivedDave Parks
2022-10-28Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-28SL-18453 WIP -- Use GLTF draw pool to render shadows. Still need a GLTF ↵Dave Parks
specific shadow shader to multiply alpha.
2022-10-28SL-18441 Fix logging to be more informative and logcontrol compatible.Andrey Kleshchev
2022-10-27SL-18441 "Override" UI cleanupAndrey Kleshchev
2022-10-27SL-18446 Live editing material should not override objects without pbrAndrey Kleshchev
Objects without pbr have no base to override
2022-10-27SL-18411: GLTF material transform serialization, plus fix improper indexing ↵Cosmic Linden
not matching GLTF spec
2022-10-27SL-18008 Edit PBR in menu should not be enabled if selection has no pbr ↵Andrey Kleshchev
materials
2022-10-27SL-17699 Enable 'none' button it amterial pickerAndrey Kleshchev
2022-10-27SL-18459 WIP -- fix for assert in setGLTFMaterialDave Parks
2022-10-27SL-18454 Fix for HUDs with alpha mask using wrong shader.Dave Parks
2022-10-26SL-18472 Fix for assert when increasing number of texture entries on ↵Dave Parks
existing primitive with overrides applied.
2022-10-26Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-26SL-18469 Fix for material edits only applying to one face.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 18:11:11 +0000