summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-06-13Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-12Merge pull request #1745 from secondlife/project/gltf_developmentBrad Linden
move project/gltf development to develop
2024-06-12Add whitespace change to .git-blame-ignore-revs for pr #1723Brad Linden
2024-06-12Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-devBrad Linden
maint a merge to gltf dev
2024-06-12Fix whitespace pre-commit hook failuresBrad Linden
2024-06-12Fixup more signed/unsigned warnings after merge.Brad Linden
2024-06-12Merge remote-tracking branch 'origin/project/gltf_development' into ↵Brad Linden
brad/maint-a-merge-to-gltf-dev # Conflicts: # indra/newview/gltf/primitive.cpp
2024-06-12Merge pull request #1724 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass
2024-06-11Merge pull request #1726 from secondlife/roxie/webrtc-voiceRoxanne Skelly
Merge from main.
2024-06-11Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-11secondlife/viewer#1475: PBR Terrain texture transform UI: Second passCosmic Linden
2024-06-11Merge remote-tracking branch 'origin/release/maint-a' into ↵Brad Linden
project/gltf_development
2024-06-11Fixed signed/unsigned warnings after they got enabled in the maint-A mergeBrad Linden
2024-06-11#1718 Add GLTF support for multiple texcoords (#1720)Dave Parks
* Fix for GLTF MeshPrimitiveModes test
2024-06-11#1687 Add support for KHR_texture_transform (#1717)Dave Parks
2024-06-11Merge pull request #1690 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: Update PBR Terrain test plans
2024-06-11Fix some apparent previous merge errorAnsariel
2024-06-11Fix possible null pointer access crashAnsariel
2024-06-11Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
2024-06-11Windows build fix following #1695Andrey Lihatskiy
2024-06-11Trim remaining trailing whitespaces after #1695Andrey Lihatskiy
2024-06-11Merge pull request #1685 from ↵nat-goodspeed
secondlife/brad/materials_featurette_build_workaround Attempted workaround for actions/runner-images#10004 build failures.
2024-06-11Clean up line endings that got mangled up during last mergeAnsariel
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp
2024-06-10Merge branch 'main' into brad/materials_featurette_build_workaroundNat Goodspeed
2024-06-10secondlife/viewer#1475: Update PBR Terrain test plansCosmic Linden
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-10Merge remote-tracking branch 'origin/main' into project/gltf_developmentBrad Linden
2024-06-10Try to get sign-and-package-windows job a runner to run onBrad Linden
2024-06-11Re-enable compiler warnings C4127, C4512 & C4706Ansariel
Disable particular CRT and WinSock API warnings for functions Microsoft considers unsafe/deprecated
2024-06-10#1677 Add GLTF extensions serialization and support for KHR_materials_unlit ↵Dave Parks
(#1686)
2024-06-10Increment viewer version to 7.1.9Nat Goodspeed
following promotion of secondlife/viewer #648: Release/materials featurette
2024-06-10Merge release/materials_featurette to main on promotion of secondlife/viewer ↵Nat Goodspeed
#648: Release/materials featurette
2024-06-10Attempted workaround for actions/runner-images#10004 build failures.Brad Linden
2024-06-10Fix merge error introduced in eb526fec0aadcaf30363fdfb1e253a609bf83accAnsariel
2024-06-10Merge pull request #1667 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: Add PBR terrain repeats editing
2024-06-10secondlife/viewer#1475: Fix whitespace and remove commentCosmic Linden
2024-06-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
2024-06-10Add line endings changes to .git-blame-ignore-revsAndrey Lihatskiy
2024-06-10Merge pull request #1585 from secondlife/signal/trim-trailingAndrey Lihatskiy
Trim trailing whitespace
2024-06-10Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailingAndrey Lihatskiy
2024-06-10Fix possible null pointer crashAnsariel
2024-06-10Fix incorrect use of VX/VY/VZ/VW indices when color components are accessedAnsariel
2024-06-10viewer#1673 Crash calling dirtyDescendantsFilterAndrey Kleshchev
2024-06-10#1654 generate normals and tangents according to gltf specification (#1662)Dave Parks
* Disable unloading of objects in background. * Add unlit GLTF shader variant
2024-06-10Fix Windows build following #1676Andrey Lihatskiy
2024-06-10Merge pull request #1676 from Ansariel/DRTVWR-600-maint-AAndrey Lihatskiy
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10Add more missing type castsAnsariel
2024-06-10Re-enable compiler warnings C4018, C4100, C4231 and C4506Ansariel
2024-06-10Update fix_whitespace.py to handle newlines correctlyAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:54:58 +0000