Commit Graph

50753 Commits (aa6161ca94d5bd8640840f981ca8b243b553acaa)

Author SHA1 Message Date
Brad Linden aa6161ca94 Shorten SHA value used in tag id and attempt to fix js/yaml syntax error 2024-06-20 17:10:00 -07:00
Brad Linden e165be0007 Attempt to use provided GITHUB_TOKEN and generate tag id from inputs 2024-06-18 14:31:41 -07:00
Brad Linden 05efb1494d Fix yaml indentation of javascript snippet in tag-release workflow 2024-06-17 19:17:18 -07:00
Brad Linden f5659945b5 Fix secret name since GITHUB_ prefix is reserved 2024-06-17 18:54:45 -07:00
Brad Linden 3da16d1899 Attempt to fix tag-release workflow by moving conditional secrets usage into env 2024-06-17 18:38:00 -07:00
Brad Linden 352dff6830
Attempt to fix workflow syntax in new tag-release workflow (#1792) 2024-06-17 18:32:24 -07:00
Brad Linden ee5d1102c3
Merge pull request #1763 from secondlife/brad/tag-nightly
Setting up scheduled and manually dispatched releases.
2024-06-17 18:02:11 -07:00
Brad Linden dd64c39d64 Pass through input channel to select the tag channel name 2024-06-17 17:55:29 -07:00
Brad Linden b9a8b3b240 Update naming and add options to tag-release workflow_dispatch. 2024-06-17 17:43:02 -07:00
Brad Linden 84a221e7dd Renamed tag-nightly.yaml to generalize it to other tags when using workflow_dispatch 2024-06-17 17:41:53 -07:00
Brad Linden e22408a27e make Second Life Develop be recognized as a Beta channel 2024-06-14 15:08:50 -07:00
Dave Parks 375555012f
1736 audit texture image unit usage on os x (#1739)
* #1736 Remove some unused samplers from glsl files and refactor shader manager to assume 16 texture image units and 4 indexed texture units all the time.
2024-06-14 17:06:07 -05:00
Brad Linden 29130e16bc
Merge pull request #1747 from megapahit/beacon
Fixes secondlife/viewer#999 lltracker beacon performance issue
2024-06-14 13:40:29 -07:00
Dave Parks f4eae44067
Fix for warnings/errors after Visual Studio update (#1775) 2024-06-14 13:47:19 -05:00
Brad Linden 0e1e1685d4 Skip the actual tag update step gracefully until we have proper tokens set up 2024-06-13 18:14:21 -07:00
Brad Linden b9f287815a Add new viewer_channel detection for develop branch 2024-06-13 17:55:05 -07:00
Brad Linden 41cb778fb0 Initial work setting up scheduled releases for develop branch. 2024-06-13 17:41:17 -07:00
cosmic-linden 0ed3483b33
Merge pull request #1743 from secondlife/v-1475
secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions
2024-06-13 12:51:39 -07:00
Cosmic Linden 74765c1573 secondlife/viewer#907: Remove unused setting 2024-06-13 12:49:51 -07:00
Cosmic Linden fcf9af42fa secondlife/viewer#907: Review feedback 2024-06-13 12:49:48 -07:00
Cosmic Linden fa4e463ba8 secondlife/viewer#1744: Fix missing LSL constant INVENTORY_SETTING in keywords_lsl_default.xml 2024-06-13 09:11:40 -07:00
Cosmic Linden 8861264d8d secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions 2024-06-13 09:11:39 -07:00
mobserveur 219448127a lltracker::drawbeacon() rewritted for better performance
this is a better implementation of the drawBeacon() function compared to the previous patch
2024-06-13 08:18:15 +02:00
mobserveur bb55d25d47 fixed tracker beacon performance issue on apple silicon macs
tracking beacon was causing extreme lag on apple silicon macs
2024-06-13 08:18:15 +02:00
Brad Linden 162c87a0a8
Merge pull request #1746 from Ansariel/develop
Fix a few merge issues
2024-06-12 18:03:31 -07:00
Ansariel 15b3c9f164 Fix a few merge issues 2024-06-13 02:22:03 +02:00
Brad Linden 100ebbab24
Merge pull request #1745 from secondlife/project/gltf_development
move project/gltf development to develop
2024-06-12 17:04:34 -07:00
Brad Linden ae74ca8069 Add whitespace change to .git-blame-ignore-revs for pr #1723 2024-06-12 14:39:32 -07:00
Brad Linden 071e464155
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
maint a merge to gltf dev
2024-06-12 14:33:01 -07:00
Brad Linden 8444cd9562 Fix whitespace pre-commit hook failures 2024-06-12 13:51:21 -07:00
Brad Linden 8729c0d2c4 Fixup more signed/unsigned warnings after merge. 2024-06-12 12:53:45 -07:00
Brad Linden d12c897bfc Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
# Conflicts:
 #	indra/newview/gltf/primitive.cpp
2024-06-12 10:31:27 -07:00
cosmic-linden f0de2ba634
Merge pull request #1724 from secondlife/v-1475
secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass
2024-06-12 09:25:28 -07:00
Cosmic Linden d2145142d9 secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass 2024-06-11 18:09:47 -07:00
Brad Linden 9775d7ea10 Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development 2024-06-11 17:42:17 -07:00
Brad Linden a7b0f93911 Fixed signed/unsigned warnings after they got enabled in the maint-A merge 2024-06-11 15:39:48 -07:00
Dave Parks f40fbdf4ad
#1718 Add GLTF support for multiple texcoords (#1720)
* Fix for GLTF MeshPrimitiveModes test
2024-06-11 17:10:13 -05:00
Dave Parks 429c92ad75
#1687 Add support for KHR_texture_transform (#1717) 2024-06-11 13:27:54 -05:00
cosmic-linden 961b6b0c7e
Merge pull request #1690 from secondlife/v-1475
secondlife/viewer#1475: Update PBR Terrain test plans
2024-06-11 09:45:54 -07:00
Ansariel 0870539264 Fix some apparent previous merge error 2024-06-11 18:22:32 +02:00
Ansariel 2050429e98 Fix possible null pointer access crash 2024-06-11 17:49:58 +02:00
Andrey Lihatskiy ef9f4b38e9 Merge branch 'main' into DRTVWR-600-maint-A 2024-06-11 17:51:35 +03:00
Andrey Lihatskiy f25440c8f0 Windows build fix following #1695 2024-06-11 17:48:47 +03:00
Andrey Lihatskiy 3d4bc98f6b Trim remaining trailing whitespaces after #1695 2024-06-11 17:38:48 +03:00
nat-goodspeed f5e2708a0f
Merge pull request #1685 from secondlife/brad/materials_featurette_build_workaround
Attempted workaround for actions/runner-images#10004 build failures.
2024-06-11 09:59:42 -04:00
Ansariel 1ebf62e102 Clean up line endings that got mangled up during last merge 2024-06-11 15:40:09 +02:00
Ansariel d9789bfaf2 Merge branch 'main' of https://github.com/secondlife/viewer into 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-11 13:38:43 +02:00
Nat Goodspeed 4b35328e49 Merge branch 'main' into brad/materials_featurette_build_workaround 2024-06-10 21:54:59 -04:00
Cosmic Linden 00c4d2ed4e secondlife/viewer#1475: Update PBR Terrain test plans 2024-06-10 17:03:27 -07:00
Brad Linden 7c42711ca3 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development 2024-06-10 16:22:12 -07:00