summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
AgeCommit message (Collapse)Author
2022-11-14Merged in SL-18627 (pull request #1193)Sabrina Shanman
SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls Approved-by: Andrey Kleshchev
2022-11-12SL-18391 Basic gltf material accountingAndrey Kleshchev
Plan is to expand it as needed with overrides, request rate and memory
2022-11-11SL-18627: Make space for pbr transform controls in build floater and disable ↵Cosmic Linden
some WIP controls
2022-11-08SL-18197 Bump inventory cache versionAndrey Kleshchev
Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns). Also made 'legacy' materials folder's name localizable just in case.
2022-11-03SL-18548 fix for crash when trying to Save material without capsMnikolenko Productengine
2022-11-03SL-18448 Save material button in tools floaterAndrey Kleshchev
2022-11-02SL-18448 Make material editor's scroll smarterAndrey Kleshchev
2022-11-02SL-18522 Use naming consistent with GLTF standardAndrey Kleshchev
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-10-29SL-18448 Material Editor and Tools floater adjustmentsAndrey Kleshchev
1. Enable glow 2. Added buttons to texture->pbr
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-27SL-18441 "Override" UI cleanupAndrey Kleshchev
2022-10-27SL-17699 Enable 'none' button it amterial pickerAndrey Kleshchev
2022-10-25SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menuAndrey Kleshchev
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-17SL-18008 Placeholder functionality for PBR Edit buttonAndrey Kleshchev
2022-10-17SL-18008 Add Save and Edit buttons to right click menu for materialsAndrey Kleshchev
2022-10-13SL-18125 Separate GLTF permissions from normal uploadsAndrey Kleshchev
2022-10-12SL-18190 Remove water reflection detail combo box and reimplement ↵Dave Parks
"Transparent Water" checkbox.
2022-10-06SL-18190 Water shader WIP. Better parallax correction for sphere probes. ↵Dave Parks
Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-09-27SL-17640 Support loading materials from multi-material filesAndrey Kleshchev
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-09-22SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling ↵Dave Parks
reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
2022-09-16Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-16SL-18161 Change pbr folder nameAndrey Kleshchev
2022-09-15SL-18161 Fix missing folder name localizationsAndrey Kleshchev
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15SL-18161 Add PBR materials to Uploads in preferencesAndrey Kleshchev
2022-09-13SL-17653 Removed unneeded combo boxAndrey Kleshchev
2022-09-08SL-3007 Report abuse option in paticipan listAndrey Kleshchev
2022-09-06SL-18097 Don't permit multiple instances of 'unsaved changes' popupsAndrey Kleshchev
Make notifications modal. When multiple ones are visible, first popup works, interacting with second one causes a crash. And it shouldn't be possible to change anything in floater when these notifications are visible
2022-09-05SL-17999 Small cleanupAndrey Kleshchev
2022-09-02SL-17999 PBR should reuse texture possition channels from normal materialsAndrey Kleshchev
2022-09-02SL-18039 Added scroll into material editorAndrey Kleshchev
2022-09-01SL-17653 Finalized texure picker's local filteringAndrey Kleshchev
2022-09-01SL-17999 PBR material in tool's texture tabAndrey Kleshchev
2022-09-01SL-17653 In texture picker cleaned up permanently invisible 'show folders' ↵Andrey Kleshchev
checkbox
2022-08-31SL-17703: Fix mergePtolemy
2022-08-30SL-17703: PBR: Fix albedo being in wrong color space, add support for debug ↵Ptolemy
default_irradiance.png
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-08-30SL-18038 Remove placeholder "save as material" buttonDave Parks
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-23SL-17653 Local gltf materials #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-17SL-17699 Add upport for materials to texture picker: restore the asset ↵Callum Prentice
filtered inventory panel and pull in @Caladbolg's fix to make it work with more than 1 asset type from here https://bitbucket.org/lindenlab/viewer/commits/0ab6dfa12eb04238d82c7a4aea7390cbd28beacd
2022-08-17SL-17699 Add upport for materials to texture picker. Temporarilyly change ↵Callum Prentice
the filtered inventory panel to a regular one so that materials show too. A fix for this that lets us revert to the asset_filtered version is in progress and will be pulled in soon - then this change too will be reverted