summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
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-18443 Allow nulling out of override data and implement new override ↵Dave Parks
message protocol.
2022-10-24SL-18105 Add mechanism for applying overrides that were received before ↵Dave Parks
associated ViewerObject was ready to receive them.
2022-10-22SL-18105 When saving an object's material to inventory, save the version ↵Dave Parks
that as overrides applied.
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-20SL-18105 Add remaining parameters to applyOverrideDave Parks
2022-10-20SL-18411: Copy over LLGLTFMaterial changes (most notably various ↵Cosmic Linden
getters/setters and texture transform stub)
2022-10-19Xcode compat fix for SL-18105 material overridesBrad Kittenbrink
2022-10-19SL-18105 Hook up TE override material to render pipe by way of render material.Dave Parks
2022-10-19SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and ↵Dave Parks
add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
2022-10-19SL-18105 viewer side for handling Material Override LargeGenericMessageBrad Kittenbrink
LLGLTFMaterialList now decodes gltf json overrides from the server and stores them in LLTextureEntry::mGLTFMaterialOverrides
2022-10-17WIP for SL-17697 live editing now computes diffs of changed material ↵Brad Kittenbrink
properties in tinygltf schema json
2022-10-14SL-18105 Add to/from json capability to LLGLTFMaterialDave Parks
2022-09-23SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all ↵Dave Parks
meshes.
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
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-15SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to ↵Dave Parks
recover mesh's original coordinate frame when generating tangents post download.
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-12SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents ↵Dave Parks
in the mesh's original coordinate frame.
2022-08-08SL-17937 Fix for broken PBR material batching.Dave Parks
2022-08-05Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-08-05SL-17870 Nudge PBR material textures so they start downloading. (and add ↵Dave Parks
missing validation code for reflection probes network data).
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-07-21SL-17801: Add various safeguards to keep triangle indices count validCosmic Linden
2022-06-29SL-17685 Drag and drop material supportDave Parks
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 '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 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-23Correcting windows specific filesystem issues and removing unused DAE code ↵Brad Kittenbrink
in llgltfloader.cpp from SL-17214
2022-06-23SL-17653 Last commit was accidentally partialDave Parks
2022-06-23SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵Dave Parks
when you click "Save"
2022-06-21SL-17635 remove unused variablesMaxim Nikolenko
2022-06-11SL-17475 Remap models before simplificationAndrey Kleshchev
2022-06-09SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select ↵Dave Parks
Invisible Objects" checkbox instead of "Select Reflection Probes"
2022-06-09VS2019 build fixDave Parks
2022-06-08SL-17214 remove some dae clutter from gltf headerDave Houlton
2022-06-08SL-17214 add 3p-tinygltf dependency to autobuild.xmlDave Houlton
2022-06-08SL-17214 re-work gltf data organizationDave Houlton
2022-06-08SL-17214 additional glTF validation, remove dead code from DAE loaderDave Houlton
2022-06-08SL-17214 initial loader class skeletonDave Houlton
2022-06-03SL-17285 Build fix take two.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 13:36:24 +0000