point solarxr to main

SlimeVR · Jul 31, 2024 · f511283 · f511283
1 parent 8b1ac76
commit f511283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java b/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java
@@ -189,7 +189,8 @@ public static int createModelSettings(
 				humanPoseManager.getToggle(SkeletonConfigToggles.VIVE_EMULATION),
 				humanPoseManager.getToggle(SkeletonConfigToggles.TOE_SNAP),
 				humanPoseManager.getToggle(SkeletonConfigToggles.FOOT_PLANT),
-				humanPoseManager.getToggle(SkeletonConfigToggles.SELF_LOCALIZATION)
+				humanPoseManager.getToggle(SkeletonConfigToggles.SELF_LOCALIZATION),
+				false
 			);
 		int ratiosOffset = ModelRatios
 			.createModelRatios(

diff --git a/solarxr-protocol b/solarxr-protocol
+12 −2		protocol/cpp/include/solarxr_protocol/generated/all_generated.h
+12 −4		protocol/java/src/solarxr_protocol/rpc/settings/ModelToggles.java
+6 −0		protocol/java/src/solarxr_protocol/rpc/settings/ModelTogglesT.java
+11 −3		protocol/kotlin/src/solarxr_protocol/rpc/settings/ModelToggles.kt
+17 −0		protocol/rust/src/generated/solarxr_protocol/rpc/settings/model_toggles_generated.rs
+20 −5		protocol/typescript/src/solarxr-protocol/rpc/settings/model-toggles.ts
+1 −0		schema/settings/model.fbs