summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'brad/fix-mac-channel' into release/materials_featuretteBrad Linden
2024-05-15Fix channel detection for mac buildsBrad Linden
2024-05-15Merge pull request #1488 from secondlife/brad/gltf-dev-featurttes-mergecosmic-linden
brad/gltf dev featurttes merge
2024-05-15Merge commit '29be88d60d654193926add496d2d851f7c217356' into ↵Brad Linden
project/gltf_development
2024-05-15Merge pull request #1487 from secondlife/v-1474cosmic-linden
secondlife/viewer#1474: Remove small texture offset from PBR terrain
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15Move all release_run logic into setvar job.Brad Linden
2024-05-16Merge pull request #1478 from secondlife/marchcat/x-mf-mergeAndrey Lihatskiy
Maint X -> Materials Featurette merge
2024-05-15secondlife/viewer#1474: Fix broken shader compilationCosmic Linden
2024-05-15Experiment with getting manually triggered workflow builds to optionally do ↵Brad Linden
a release
2024-05-15Streamline the new workflow `RELEASE_RUN` logic a little.Nat Goodspeed
Since downstream jobs reference the output of the new `setvar` job, instead of directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in the global environment.
2024-05-16Merge branch 'release/materials_featurette' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15#1267 Fix for alpha cutoff of zero and base color factor alpha of zero ↵Dave Parks
making objects disappear (#1485)
2024-05-15jira-archive-internal#67837 Windows' bulk export of snapshots and texturesAndrey Kleshchev
Properly sanitize names Better duplicate avoidance
2024-05-15Merge branch 'main' into nat/releaseos following Maint X promotionNat Goodspeed
2024-05-15Merge commit 'e7eced3' into nat/releaseos for whitespace fix.Nat Goodspeed
2024-05-15Make env.RELEASE_RUN the empty string if falseNat Goodspeed
not the string "false", which is true.
2024-05-15Can't reference global env in job.if either.Nat Goodspeed
2024-05-15Try to work around workflow YAML env setting limitation.Nat Goodspeed
2024-05-15#1466 Loosen clamp on haze glow to fix skies that want to be bonkers (#1470)Dave Parks
2024-05-15secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working ↵Alexander Gavriliuk
as expected
2024-05-15Merge pull request #1482 from secondlife/v-1474cosmic-linden
secondlife/viewer#1474: Remove small texture offset from PBR terrain
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15#1457 Fix the tests on macAndrey Lihatskiy
(cherry picked from commit 82d713782529074b03720833038cb0df2b8bcffd)
2024-05-15Merge branch 'release/maint-x' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15triage#49 Menu didn't work for already selected itemsAndrey Kleshchev
2024-05-14Increment viewer version to 7.1.8Nat Goodspeed
following promotion of secondlife/viewer #705: Maintenance X
2024-05-14Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: ↵Nat Goodspeed
Maintenance X
2024-05-14Merge pull request #1473 from secondlife/brad/gltf-dev-mac-shader-fixcosmic-linden
brad/mac shader fix
2024-05-14Fix shader error on mac: 'Redeclaration of sized array 'terrain_texcoord' ↵Brad Linden
not allowed'
2024-05-14Merge branch 'brad/gltf-dev-merge-main-and-featurettes' into ↵Brad Linden
project/gltf_development
2024-05-14Merge pull request #1446 from Ansariel/project/gltf_developmentDave Parks
Fix broken merge and BOOL/bool issues
2024-05-14Merge branch 'project/gltf_development' into project/gltf_developmentDave Parks
2024-05-14Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Brad Linden
project/gltf_development
2024-05-14Merge pull request #1453 from secondlife/v-907cosmic-linden
secondlife/viewer#907: Local PBR terrain texture transform in advanced settings
2024-05-14Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-05-14#1457 Fix the tests on macAndrey Lihatskiy
2024-05-14#1457 Temporarily disable the tests to unblock Maint X buildsAndrey Lihatskiy
This reverts commit 4329e95379173a304e91dd0b7513e936aeded380.
2024-05-13secondlife/viewer#907: Fix LLGLTFMaterial testsCosmic Linden
2024-05-13secondlife/viewer#907: Fix bad merge in LLGLTFMaterialCosmic Linden
Caused by a conflict between the LLGLTFMaterial::getHash fix, and an improvement in LLGLTFMaterial field ordering for platform-dependent memory reduction.
2024-05-13Revert "viewer#819 Avoid reading the same XML file multiple times"Andrey Kleshchev
This reverts commit a865d423974ea06dffa47798c81e98e7570b02ec. Reason for revert: viewer#1420, reverting to not hold maint-A (is deepCopy not full?)
2024-05-13Run ReleaseOS builds, but only when a release page is requested.Nat Goodspeed
2024-05-13Merge pull request #1460 from secondlife/DRTVWR-600-maint-ADave Parks
viewer#1420 Fixed names not showing in Chat
2024-05-13viewer-private#236 Don't block removal of marketplace foldersAndrey Kleshchev
Marketplace is not visible outside of own floater and that floater will do an extra warning when deleting listings that have additional data.
2024-05-13Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # autobuild.xml
2024-05-13Merge pull request #1373 from secondlife/marchcat/x-ws-mergeAndrey Lihatskiy
2024-05-11Fix syntax error in build.yaml to enable Windows ReleaseOSNat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 10:27:39 +0000