From c4c3cca72873442d0f02db5288fcc6a2452bee1b Mon Sep 17 00:00:00 2001 From: SDraw Date: Sun, 16 Feb 2025 14:17:44 +0300 Subject: [PATCH] Fix of moving to side on avatar change --- README.md | 4 ++-- ml_prm/Properties/AssemblyInfo.cs | 2 +- ml_prm/RagdollController.cs | 8 ++++---- ml_prm/ml_prm.csproj | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ca82063..3b407ba 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Merged set of MelonLoader mods for ChilloutVR. |:---------:|:--------------:| |[Avatar Motion Tweaker](/ml_amt/README.md)|1.5.0 [:arrow_down:](../../releases/latest/download/AvatarMotionTweaker.dll)| |[Avatar Synced Look](/ml_asl/README.md)|1.1.0 [:arrow_down:](../../releases/latest/download/AvatarSyncedLook.dll)| -|[Better Fingers Tracking](/ml_bft/README.md)|1.1.0 [:arrow_down:](../../releases/latest/download/BetterFingersTracking.dll)| +|[Better Fingers Tracking](/ml_bft/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/BetterFingersTracking.dll)| |[Desktop Head Tracking](/ml_dht/README.md)|1.3.0 [:arrow_down:](../../releases/latest/download/DesktopHeadTracking.dll)| |[Leap Motion Extension](/ml_lme/README.md)| 1.6.0 [:arrow_down:](../../releases/latest/download/LeapMotionExtension.dll)| |[Pickup Arm Movement](/ml_pam/README.md)|1.2.1 [:arrow_down:](../../releases/latest/download/PickupArmMovement.dll)| |[Player Movement Copycat](/ml_pmc/README.md)|1.1.0 [:arrow_down:](../../releases/latest/download/PlayerMovementCopycat.dll)| -|[Player Ragdoll Mod](/ml_prm/README.md)|1.2.1 [:arrow_down:](../../releases/latest/download/PlayerRagdollMod.dll)| +|[Player Ragdoll Mod](/ml_prm/README.md)|1.2.2 [:arrow_down:](../../releases/latest/download/PlayerRagdollMod.dll)| |[Players Instance Notifier](/ml_pin/README.md)|1.1.0 [:arrow_down:](../../releases/latest/download/PlayersInstanceNotifier.dll)| |[Vive Extended Input](/ml_vei/README.md)|1.1.0 [:arrow_down:](../../releases/latest/download/ViveExtendedInput.dll)| diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs index 6a92fe5..523d153 100644 --- a/ml_prm/Properties/AssemblyInfo.cs +++ b/ml_prm/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.2.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.2.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(2)] [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")] diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index 6a69c8f..08f29df 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -365,10 +365,6 @@ namespace ml_prm } } - // And return back - m_puppetRoot.position = m_avatarTransform.position; - m_puppetRoot.rotation = m_avatarTransform.rotation; - m_vrIK = PlayerSetup.Instance._avatar.GetComponent(); if(m_vrIK != null) m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostSolverUpdate); @@ -391,6 +387,10 @@ namespace ml_prm l_handler.SetColliderMaterial(m_physicsMaterial); } + // And return back + m_puppetRoot.position = m_avatarTransform.position; + m_puppetRoot.rotation = m_avatarTransform.rotation; + m_avatarReady = true; m_initTask = null; diff --git a/ml_prm/ml_prm.csproj b/ml_prm/ml_prm.csproj index 065b449..d0b8ece 100644 --- a/ml_prm/ml_prm.csproj +++ b/ml_prm/ml_prm.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 PlayerRagdollMod - 1.2.1 + 1.2.2 SDraw SDraw PlayerRagdollMod