summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2022-06-27SL-17640 Fix name usage, fix "apply now"Andrey Kleshchev
This reverts commit 231c618a844cee26a3779b703c88d8807df872e6, instead color swatched get enabled 'apply now' in xml.
2022-06-27Fix coding polict trigraphs check for DRTVWR-559Brad Kittenbrink
2022-06-27Merge remote-tracking branch 'origin/DRTVWR-559' into ↵Brad Kittenbrink
brad/SL-17602-new-material-upload
2022-06-27Initial pass at SL-17602 saving material to inventory from material editor ↵Brad Kittenbrink
floater.
2022-06-27SL-17653 Make changes in material editor apply to selection immediately and ↵Dave Parks
enable "apply now" checkbox in color swatches.
2022-06-25SL-17640 Materials Upload UI #3Andrey Kleshchev
Fixed issues in button layout Added 'unsaved changes' notification
2022-06-24SL-17274: PBR: Fix typo of commit 4e1a4e80e4Ptolemy
2022-06-24SL-17274: PBR: Add note about DEBUG_PBR_NORMALPtolemy
2022-06-24SL-17274: PBR: Add DEBUG_NORMAL_RAW, DEBUG_NORMAL_OUT to PBR shaderPtolemy
2022-06-24SL-17274: PBR: Add BRDF debugPtolemy
2022-06-24SL-17274: PBR: Add roughness alpha debugPtolemy
2022-06-24Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-24SL-17274: Cleanup frag_dataPtolemy
2022-06-24SL-17274 Hook up albedo tint to pbropaqueFDave Parks
2022-06-24SL-17274 Hook up emissive map and non-texture parameters to pbropaqueF.glslDave Parks
2022-06-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-24SL-17658 Make Material Importer strip alpha channels and repack occlusion as ↵Dave Parks
needed.
2022-06-24Merged in brad/unbreak-mac-build (pull request #1034)Brad Kittenbrink
Unbreak DRTVWR-559 mac build
2022-06-24SL-17273: Expand GBuffer for PBR emissivePtolemy
2022-06-24SL-17650 Add Material as a filter option to Inventory filter floaterMnikolenko Productengine
2022-06-24SL-17649 Icon for Material type in InventoryMnikolenko Productengine
2022-06-24fix DRTVWR-559 mac build coding policy error for missing newline at EOFBrad Kittenbrink
2022-06-23clang compatibility fixes for llreflectionmapmanager.cpp and llvovolume.hBrad Kittenbrink
2022-06-23WIP adding check for existence of ARB_texture_cube_map_array extensionBrad Kittenbrink
2022-06-23Correcting windows specific filesystem issues and removing unused DAE code ↵Brad Kittenbrink
in llgltfloader.cpp from SL-17214
2022-06-23fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed ↵Brad Kittenbrink
glext.h
2022-06-24SL-17640 Materials Upload UI #2Andrey Kleshchev
New Fee fields New Buttons
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb
2022-06-23SL-17653 Fix writing of PBR materials to gbuffer.Dave Parks
2022-06-23SL-17653 Make sure GLTF material associated vertex buffers have all their ↵Dave Parks
texture coordinates
2022-06-23SL-17653 Make batch builder send batches to LLDrawPoolPBROpaqueDave Parks
2022-06-23Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-23SL-17274: Add WIP PBR ShaderPtolemy
2022-06-23Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-23SL-17653 Flip imported GLTF textures, remove .dae and .glb/.gltf from file ↵Dave Parks
dialogs that don't support them
2022-06-23SL-17274: Fix shaders to use normal and spec mapsPtolemy
2022-06-23Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-23SL-17273: Fix drawpool to pass normal and spec map to PBR shaderPtolemy
2022-06-23Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-23SL-17653 Last commit was accidentally partialDave Parks
2022-06-23Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559Ptolemy
2022-06-23SL-17273: Add RENDER_TYPE_PASS_PBR_OPAQUEPtolemy
2022-06-23SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵Dave Parks
when you click "Save"
2022-06-23SL-17273: Fix off-by-one bug in gPoolNames, fix formatting so it can't ↵Ptolemy
happen in the future
2022-06-23Merged DRTVWR-559 into SL-17274_gbuffer_flagsMichael Pohoreski
2022-06-23Merged DRTVWR-559 into SL-17274_view_dirMichael Pohoreski
2022-06-22SL-17600 Cubemap filter tuning.Dave Parks
2022-06-22SL-17274: Add GBuffer flag for PBRPtolemy
2022-06-22SL-17600 Proper irradiance probes.Dave Parks
2022-06-22Add tinygltf and Vulkan GLTF to licenses.txtDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:47:27 +0000