livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,287 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

530 Commits (0573e31002fcaf67f6e405ebbf4dae230b78adad)

Author SHA1 Message Date
Ansariel 0573e31002 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/pipeline.cpp
 2025-08-31 12:07:48 +02:00
Dan Linden e33439e523
Update qatest.yaml 
corrected kurt's machine name to qa-windows-kurt
 2025-08-26 15:18:10 -07:00
Dan Linden bbdb46a833
Update qatest.yaml 
Removed dan's z600 windows machine from the matrix.
Added dan's mac, caleb's mac and kurt's windows machines.
 2025-08-26 14:41:07 -07:00
Ansariel e8b42af7a7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-19 19:16:16 +02:00
Beq 70768b815f Final permutation test. try gcc-13 and hope. 2025-08-17 21:38:24 +01:00
Beq d7e2e91dca Merge branch 'try-22.04' 2025-08-17 21:18:28 +01:00
Beq e7a0751a2c Try g++-14 on the slow older runners :-( 2025-08-17 21:15:14 +01:00
Beq 2339174f66 Ubuntu 22.04 python is not python3 (I think) 2025-08-17 14:47:11 +01:00
Beq dabf5cc037 Fx indent 2025-08-17 14:26:21 +01:00
Beq 979593d5fb Workaround container needing 22.04 python 2025-08-17 14:18:02 +01:00
Ansariel bcaa272e91 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/gltf/asset.cpp
 2025-08-16 12:35:36 +02:00
Beq 6833849876 Need to adjust runs-on to pick up the container properly 2025-08-15 18:12:38 +01:00
Beq 16a2ae0179 Use sudo inside dockerised Ubuntu 2025-08-15 17:02:34 +01:00
Beq a43c11bbaa Test containerised build on Linux with g++14 toolchain. 2025-08-15 14:22:21 +01:00
Ansariel b0b8328c5c Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llrendertarget.cpp
#	indra/newview/gltf/asset.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoicewebrtc.cpp
#	indra/newview/viewer_manifest.py
 2025-08-12 22:50:51 +02:00
Ansariel b9559762bc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-12 18:31:29 +02:00
Beq 3dcad73d2e Reduce lifetime of Beta to 28 days 
Too many old betas hang around. These add no value in testing.
Beta now 28, Alpha and Nightly both at 14
 2025-08-10 10:00:46 +01:00
Beq e33936b5c8 Add the fontconfgi1-dev package dependency 
CMake failing on 24.04, did not on 22.04 so default package setup must have changed? Either that or pkg-config is being a pain.
 2025-08-10 09:56:33 +01:00
Beq 47dbce2fa9 Move to Ubuntu 24.04 runner 2025-08-09 19:08:58 +01:00
Beq c14d0d50b1 Update macOS version for build matrix 
macos-14 to macos-15 aligns with LL
 2025-08-09 15:24:42 +01:00
Ansariel d7c73b9364 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-09 02:24:24 +02:00
Ansariel c43b544dc6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202505 2025-08-06 18:26:27 +02:00
AtlasLinden e4a25dc5b9
Merge branch 'develop' into atlas-qaworkflow 2025-08-06 09:42:26 -04:00
Andrey Kleshchev acc8928330
Merge release/2025.05 into develop 2025-08-06 14:17:18 +03:00
dependabot[bot] c1450afe6e
Bump azure/trusted-signing-action from 0.5.1 to 0.5.9 
Bumps [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action) from 0.5.1 to 0.5.9.
- [Release notes](https://github.com/azure/trusted-signing-action/releases)
- [Commits](https://github.com/azure/trusted-signing-action/compare/v0.5.1...v0.5.9)

---
updated-dependencies:
- dependency-name: azure/trusted-signing-action
  dependency-version: 0.5.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-08-01 11:01:50 +00:00
AtlasLinden 9311b522d8
Add new runners to QA workflow 2025-07-30 13:56:44 -07:00
Ansariel a4e8af0dce Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	.github/pull_request_template.md
#	CONTRIBUTING.md
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/llstatusbar.cpp
#	indra/newview/llstatusbar.h
#	indra/newview/res/viewerRes.rc
#	indra/newview/skins/default/xui/de/panel_login_first.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_login_first.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
#	indra/newview/skins/default/xui/en/panel_status_bar.xml
#	indra/newview/skins/default/xui/es/panel_login_first.xml
#	indra/newview/skins/default/xui/fr/panel_login_first.xml
#	indra/newview/skins/default/xui/it/panel_login_first.xml
#	indra/newview/skins/default/xui/ja/panel_login_first.xml
#	indra/newview/skins/default/xui/pl/panel_login_first.xml
#	indra/newview/skins/default/xui/pt/panel_login_first.xml
#	indra/newview/skins/default/xui/ru/panel_login_first.xml
#	indra/newview/skins/default/xui/tr/panel_login_first.xml
#	indra/newview/skins/default/xui/zh/panel_login_first.xml
#	indra/newview/viewer_manifest.py
 2025-07-30 10:52:39 +02:00
Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 
# Conflicts:
#	.github/pull_request_template.md
#	indra/llappearance/lltexlayer.cpp
#	indra/llcommon/llthread.cpp
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lltoolpie.cpp
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
 2025-07-18 14:14:54 +02:00
Ansariel a1ab22d153 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-07-16 13:02:01 +02:00
AtlasLinden 9cc5c07299
New method to handle removing previous viewer 
Moving previous viewer to trash instead of "removing" it.
 2025-07-10 10:36:16 -07:00
AtlasLinden db5af314b9
Remove previously installed viewer 
More permission issues encountered if a job is repeated. That is, when attempting to replace an existing installed viewer.
 2025-07-10 10:27:16 -07:00
AtlasLinden c70875e0ba
Redirecting viewer installation to Application directory 2025-07-10 08:56:37 -07:00
AtlasLinden 2f77cd09a9
Remove --no-xattrs option 2025-07-10 08:42:34 -07:00
AtlasLinden 450d4d77f7
New copy app command 
An attempt to resolve another permission issue
 2025-07-10 08:39:09 -07:00
AtlasLinden 239a9c7242
Removing previous permission "fix" 2025-07-10 08:18:16 -07:00
AtlasLinden 8fe51b3c9a
Adjusting dmg mount point 
Permission issues yet again. Adjusting this back
 2025-07-09 14:38:36 -07:00
AtlasLinden c8f6eb045d
Remove whitespace 2025-07-09 14:27:46 -07:00
AtlasLinden 9533232ce7
Mount dmg to new /Volumes 
Currently hitting another permission error while attempting to mount dmg in tmp
 2025-07-09 14:26:09 -07:00
AtlasLinden 7b4cdd3040
Adjust permission before copying app 2025-07-09 14:14:40 -07:00
AtlasLinden 8c6e766311
Adjust mac artifact name 
It was previously looking for a Mac-installer artifact instead of macOS-installer
 2025-07-09 13:12:16 -07:00
AtlasLinden 0bb0d3efea
Add mac runner 
Uncommenting mac runner lines to enable newly set up self-hosted runner with the workflow.
 2025-07-09 08:50:41 -07:00
Ansariel 9c5944f4ce Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-07-07 19:11:59 +02:00
dependabot[bot] eee837b076
Bump dawidd6/action-download-artifact from 10 to 11 
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 10 to 11.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v10...v11)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-version: '11'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-07-01 11:53:43 +00:00
Jonathan "Geenz" Goodman b0c951ffe3
Revert "Merge develop into glTF mesh import" 2025-06-27 21:28:58 -04:00
Jonathan "Geenz" Goodman 6dd8a02ed1 Merge branch 'project/gltf_mesh_import' into geenz/develop-to-gltf-mesh 2025-06-27 17:18:00 -04:00
Andrey Lihatskiy 781d9fa481 Use latest release for changelog 2025-06-24 01:29:58 +03:00
Ansariel c4333e2222 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
 2025-06-16 12:55:12 +02:00
Ansariel b7063272ff Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2025-06-16 12:46:50 +02:00
Ansariel 3f4d28329f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-06-15 17:58:08 +02:00
Andrey Lihatskiy 03b6d09ae5
Use windows-latest runner for sign-and-package-windows (#4263) 2025-06-12 03:40:20 +03:00