Merge remote-tracking branch 'upstream/main' into bscotch/android-fixes

This commit is contained in:
Butterscotch!
2025-12-09 07:53:46 -05:00
30 changed files with 992 additions and 1062 deletions

View File

@@ -78,7 +78,7 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
steps.add(
TrackingChecklistStepT().apply {
id = TrackingChecklistStepId.STEAMVR_DISCONNECTED
enabled = true
enabled = false
optional = false
ignorable = true
visibility = TrackingChecklistStepVisibility.WHEN_INVALID
@@ -266,6 +266,7 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
TrackingChecklistStepId.STEAMVR_DISCONNECTED,
steamvrConnected,
) {
it.enabled = true
if (!steamvrConnected) {
it.extraData = TrackingChecklistExtraDataUnion().apply {
type = TrackingChecklistExtraData.TrackingChecklistSteamVRDisconnected