From b92d54c162a9dc2e67ee1b294ce7e03a3a7fd62a Mon Sep 17 00:00:00 2001 From: SDraw Date: Sat, 15 Feb 2025 18:07:58 +0300 Subject: [PATCH 1/6] Fix for Unity 6 branch --- ml_amt/Properties/AssemblyInfo.cs | 2 +- ml_asl/Properties/AssemblyInfo.cs | 2 +- ml_bft/Properties/AssemblyInfo.cs | 2 +- ml_bft/Settings.cs | 4 +-- ml_bft/ml_bft.csproj | 2 +- ml_dht/Properties/AssemblyInfo.cs | 2 +- ml_lme/Properties/AssemblyInfo.cs | 2 +- ml_pam/Properties/AssemblyInfo.cs | 2 +- ml_pin/Properties/AssemblyInfo.cs | 2 +- ml_pmc/Properties/AssemblyInfo.cs | 2 +- ml_pmc/PuppetParser.cs | 58 +++++-------------------------- ml_prm/Properties/AssemblyInfo.cs | 2 +- ml_prm/RagdollBodypartHandler.cs | 8 ++--- ml_prm/RagdollController.cs | 14 ++++---- ml_prm/Utils.cs | 8 ++--- ml_prm/ml_prm.csproj | 2 +- ml_vei/Properties/AssemblyInfo.cs | 2 +- 17 files changed, 36 insertions(+), 80 deletions(-) diff --git a/ml_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs index 8b4257e..6a0913c 100644 --- a/ml_amt/Properties/AssemblyInfo.cs +++ b/ml_amt/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs index 72d8f26..73af0e4 100644 --- a/ml_asl/Properties/AssemblyInfo.cs +++ b/ml_asl/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_bft/Properties/AssemblyInfo.cs b/ml_bft/Properties/AssemblyInfo.cs index 93c43a0..a6e5620 100644 --- a/ml_bft/Properties/AssemblyInfo.cs +++ b/ml_bft/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_bft/Settings.cs b/ml_bft/Settings.cs index e7b3471..a16d2b5 100644 --- a/ml_bft/Settings.cs +++ b/ml_bft/Settings.cs @@ -24,8 +24,7 @@ namespace ml_bft SkeletalInput = 0, MotionRange, ShowHands, - MechanimFilter, - FixFingers + MechanimFilter } public static bool SkeletalInput { get; private set; } = false; @@ -56,6 +55,7 @@ namespace ml_bft SkeletalInput = (bool)ms_entries[(int)ModSetting.SkeletalInput].BoxedValue; MotionRange = (MotionRangeType)(int)ms_entries[(int)ModSetting.MotionRange].BoxedValue; ShowHands = (bool)ms_entries[(int)ModSetting.ShowHands].BoxedValue; + MechanimFilter = (bool)ms_entries[(int)ModSetting.MechanimFilter].BoxedValue; MelonLoader.MelonCoroutines.Start(WaitMainMenuUi()); } diff --git a/ml_bft/ml_bft.csproj b/ml_bft/ml_bft.csproj index bd2a16a..193d9b0 100644 --- a/ml_bft/ml_bft.csproj +++ b/ml_bft/ml_bft.csproj @@ -7,7 +7,7 @@ SDraw SDraw BetterFingersTracking - 1.1.0 + 1.1.1 BetterFingersTracking diff --git a/ml_dht/Properties/AssemblyInfo.cs b/ml_dht/Properties/AssemblyInfo.cs index dedea0a..6e7dc23 100644 --- a/ml_dht/Properties/AssemblyInfo.cs +++ b/ml_dht/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] \ No newline at end of file diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index a3079fe..e199a48 100644 --- a/ml_lme/Properties/AssemblyInfo.cs +++ b/ml_lme/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] diff --git a/ml_pam/Properties/AssemblyInfo.cs b/ml_pam/Properties/AssemblyInfo.cs index 1a996bf..b6812ae 100644 --- a/ml_pam/Properties/AssemblyInfo.cs +++ b/ml_pam/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(1)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] diff --git a/ml_pin/Properties/AssemblyInfo.cs b/ml_pin/Properties/AssemblyInfo.cs index 0b834b9..5989421 100644 --- a/ml_pin/Properties/AssemblyInfo.cs +++ b/ml_pin/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_pmc/Properties/AssemblyInfo.cs b/ml_pmc/Properties/AssemblyInfo.cs index 75ba250..10017ca 100644 --- a/ml_pmc/Properties/AssemblyInfo.cs +++ b/ml_pmc/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(3)] [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")] diff --git a/ml_pmc/PuppetParser.cs b/ml_pmc/PuppetParser.cs index 046a798..9e71cea 100644 --- a/ml_pmc/PuppetParser.cs +++ b/ml_pmc/PuppetParser.cs @@ -61,55 +61,15 @@ namespace ml_pmc m_fingerTracking = m_puppetMaster.PlayerAvatarMovementDataInput.UseIndividualFingers; if(m_fingerTracking) { - m_fingerCurls[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb1Stretched; - m_fingerCurls[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb2Stretched; - m_fingerCurls[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb3Stretched; - m_fingerSpreads[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbSpread; - - m_fingerCurls[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex1Stretched; - m_fingerCurls[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex2Stretched; - m_fingerCurls[5] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex3Stretched; - m_fingerSpreads[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexSpread; - - m_fingerCurls[6] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle1Stretched; - m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle2Stretched; - m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle3Stretched; - m_fingerSpreads[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleSpread; - - m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing1Stretched; - m_fingerCurls[10] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing2Stretched; - m_fingerCurls[11] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing3Stretched; - m_fingerSpreads[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingSpread; - - m_fingerCurls[12] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky1Stretched; - m_fingerCurls[13] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky2Stretched; - m_fingerCurls[14] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky3Stretched; - m_fingerSpreads[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkySpread; - - m_fingerCurls[15] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb1Stretched; - m_fingerCurls[16] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb2Stretched; - m_fingerCurls[17] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb3Stretched; - m_fingerSpreads[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbSpread; - - m_fingerCurls[18] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex1Stretched; - m_fingerCurls[19] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex2Stretched; - m_fingerCurls[20] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex3Stretched; - m_fingerSpreads[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexSpread; - - m_fingerCurls[21] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle1Stretched; - m_fingerCurls[22] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle2Stretched; - m_fingerCurls[23] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle3Stretched; - m_fingerSpreads[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleSpread; - - m_fingerCurls[24] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing1Stretched; - m_fingerCurls[25] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing2Stretched; - m_fingerCurls[26] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing3Stretched; - m_fingerSpreads[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingSpread; - - m_fingerCurls[27] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky1Stretched; - m_fingerCurls[28] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky2Stretched; - m_fingerCurls[29] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky3Stretched; - m_fingerSpreads[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkySpread; + for(int i = 0; i < 10; i++) + { + int l_stepA = i * 3; + int l_stepB = i * 4; + m_fingerCurls[l_stepA] = m_puppetMaster.PlayerAvatarMovementDataInput.MuscleValues[55 + l_stepB]; + m_fingerCurls[l_stepA + 1] = m_puppetMaster.PlayerAvatarMovementDataInput.MuscleValues[57 + l_stepB]; + m_fingerCurls[l_stepA + 2] = m_puppetMaster.PlayerAvatarMovementDataInput.MuscleValues[58 + l_stepB]; + m_fingerSpreads[i] = m_puppetMaster.PlayerAvatarMovementDataInput.MuscleValues[56 + l_stepB]; + } } Matrix4x4 l_current = this.transform.GetMatrix(); diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs index 6a92fe5..c05dd36 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-u6", "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/RagdollBodypartHandler.cs b/ml_prm/RagdollBodypartHandler.cs index 4da1439..78e9a01 100644 --- a/ml_prm/RagdollBodypartHandler.cs +++ b/ml_prm/RagdollBodypartHandler.cs @@ -123,7 +123,7 @@ namespace ml_prm public bool IsReady() => ((m_rigidBody != null) && (collider != null) && (!m_shouldHaveInfluencer || ((m_physicsInfluencer != null) && m_physicsInfluencer.IsReady()))); public void SetInfuencerUsage(bool p_state) => m_shouldHaveInfluencer = p_state; - public void SetColliderMaterial(PhysicMaterial p_material) + public void SetColliderMaterial(PhysicsMaterial p_material) { if(collider != null) { @@ -146,7 +146,7 @@ namespace ml_prm public void SetVelocity(Vector3 p_vec) { if(m_rigidBody != null) - m_rigidBody.velocity = p_vec; + m_rigidBody.linearVelocity = p_vec; } public void SetAngularVelocity(Vector3 p_vec) @@ -167,7 +167,7 @@ namespace ml_prm { if(m_rigidBody != null) { - m_rigidBody.drag = p_value; + m_rigidBody.linearDamping = p_value; m_rigidBody.WakeUp(); } if(m_physicsInfluencer != null) @@ -178,7 +178,7 @@ namespace ml_prm { if(m_rigidBody != null) { - m_rigidBody.angularDrag = p_value; + m_rigidBody.angularDamping = p_value; m_rigidBody.WakeUp(); } if(m_physicsInfluencer != null) diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index 6a69c8f..235637c 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -40,7 +40,7 @@ namespace ml_prm RagdollToggle m_avatarRagdollToggle = null; // Custom component available for editor AvatarBoolParameter m_ragdolledParameter = null; - PhysicMaterial m_physicsMaterial = null; + PhysicsMaterial m_physicsMaterial = null; bool m_inAir = false; bool m_reachedGround = true; @@ -77,12 +77,12 @@ namespace ml_prm { this.gameObject.layer = LayerMask.NameToLayer("PlayerLocal"); - m_physicsMaterial = new PhysicMaterial("Ragdoll"); + m_physicsMaterial = new PhysicsMaterial("Ragdoll"); m_physicsMaterial.dynamicFriction = c_defaultFriction; m_physicsMaterial.staticFriction = c_defaultFriction; - m_physicsMaterial.frictionCombine = PhysicMaterialCombine.Average; + m_physicsMaterial.frictionCombine = PhysicsMaterialCombine.Average; m_physicsMaterial.bounciness = 0f; - m_physicsMaterial.bounceCombine = PhysicMaterialCombine.Average; + m_physicsMaterial.bounceCombine = PhysicsMaterialCombine.Average; m_puppet = new GameObject("[Puppet]").transform; m_puppet.parent = this.transform; @@ -583,9 +583,9 @@ namespace ml_prm bool l_bounciness = (Settings.Bounciness && WorldManager.IsSafeWorld()); m_physicsMaterial.dynamicFriction = (l_slipperiness ? 0f : c_defaultFriction); m_physicsMaterial.staticFriction = (l_slipperiness ? 0f : c_defaultFriction); - m_physicsMaterial.frictionCombine = (l_slipperiness ? PhysicMaterialCombine.Minimum : PhysicMaterialCombine.Average); + m_physicsMaterial.frictionCombine = (l_slipperiness ? PhysicsMaterialCombine.Minimum : PhysicsMaterialCombine.Average); m_physicsMaterial.bounciness = (l_bounciness ? 1f : 0f); - m_physicsMaterial.bounceCombine = (l_bounciness ? PhysicMaterialCombine.Maximum : PhysicMaterialCombine.Average); + m_physicsMaterial.bounceCombine = (l_bounciness ? PhysicsMaterialCombine.Maximum : PhysicsMaterialCombine.Average); } } @@ -701,7 +701,7 @@ namespace ml_prm { if(m_avatarReady && m_ragdolled && CanUnragdoll()) { - BetterBetterCharacterController.Instance.TeleportPlayerTo(m_puppetReferences.hips.position, PlayerSetup.Instance.GetPlayerRotation().eulerAngles, false, false); + BetterBetterCharacterController.Instance.TeleportPlayerTo(m_puppetReferences.hips.position, PlayerSetup.Instance.GetPlayerRotation().eulerAngles, false, true); TryRestoreMovement(); BodySystem.TrackingPositionWeight = 1f; IKSystem.Instance.applyOriginalHipPosition = m_applyHipsPosition; diff --git a/ml_prm/Utils.cs b/ml_prm/Utils.cs index 095f418..39347de 100644 --- a/ml_prm/Utils.cs +++ b/ml_prm/Utils.cs @@ -49,16 +49,12 @@ namespace ml_prm public static bool IsLeftGrabPointerActive(this PuppetMaster p_source) { - bool l_result = ((p_source._playerAvatarMovementDataCurrent.AnimatorGestureLeft >= 0.5f) && (p_source._playerAvatarMovementDataCurrent.AnimatorGestureLeft <= 1f)); - l_result |= ((FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.LeftMiddle1Stretched) >= 0.5f) && (FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.LeftMiddle2Stretched) >= 0.5f) && (FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.LeftMiddle3Stretched) >= 0.5f)); - return l_result; + return p_source._playerAvatarMovementDataCurrent.IsLeftHandGrabbing(); } public static bool IsRightGrabPointerActive(this PuppetMaster p_source) { - bool l_result = ((p_source._playerAvatarMovementDataCurrent.AnimatorGestureRight >= 0.5f) && (p_source._playerAvatarMovementDataCurrent.AnimatorGestureRight <= 1f)); - l_result |= ((FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.RightMiddle1Stretched) >= 0.5f) && (FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.RightMiddle2Stretched) >= 0.5f) && (FingerSystem.GetCurlNormalized(p_source._playerAvatarMovementDataCurrent.RightMiddle3Stretched) >= 0.5f)); - return l_result; + return p_source._playerAvatarMovementDataCurrent.IsRightHandGrabbing(); } public static CVRSeat GetCurrentSeat(this BetterBetterCharacterController p_instance) => (ms_lastCVRSeat?.GetValue(p_instance) as CVRSeat); 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 diff --git a/ml_vei/Properties/AssemblyInfo.cs b/ml_vei/Properties/AssemblyInfo.cs index 5a2f8a6..1fab4f8 100644 --- a/ml_vei/Properties/AssemblyInfo.cs +++ b/ml_vei/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] From c41c719d61f7f11d56dbeca9166ea1451e55f094 Mon Sep 17 00:00:00 2001 From: SDraw Date: Sat, 15 Feb 2025 19:41:45 +0300 Subject: [PATCH 2/6] Fix of moving to side on avatar change --- ml_prm/RagdollController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index 235637c..3bf0ea2 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); @@ -394,6 +390,10 @@ namespace ml_prm m_avatarReady = true; m_initTask = null; + // And return back + m_puppetRoot.position = m_avatarTransform.position; + m_puppetRoot.rotation = m_avatarTransform.rotation; + OnMovementDragChanged(Settings.MovementDrag); OnAngularDragChanged(Settings.AngularDrag); OnGravityChanged(Settings.Gravity); From 70a1dcac622f271e4d10506abe6121c2791547fe Mon Sep 17 00:00:00 2001 From: SDraw Date: Wed, 19 Feb 2025 22:49:36 +0300 Subject: [PATCH 3/6] Changeable keys for hands --- ml_pam/ArmMover.cs | 11 +++--- ml_pam/Properties/AssemblyInfo.cs | 2 +- ml_pam/Settings.cs | 60 +++++++++++++++++++++++++++---- ml_pam/ml_pam.csproj | 2 +- 4 files changed, 59 insertions(+), 16 deletions(-) diff --git a/ml_pam/ArmMover.cs b/ml_pam/ArmMover.cs index 79264c7..6f3d7e8 100644 --- a/ml_pam/ArmMover.cs +++ b/ml_pam/ArmMover.cs @@ -24,9 +24,6 @@ namespace ml_pam public Transform m_rightHandTarget; } - const KeyCode c_leftKey = KeyCode.Q; - const KeyCode c_rightKey = KeyCode.E; - static ArmMover ms_instance = null; static readonly Quaternion ms_offsetLeft = Quaternion.Euler(270f, 90f, 0f); @@ -177,13 +174,13 @@ namespace ml_pam { case HandState.Empty: { - if(Settings.Enabled && Settings.HandsExtension && Input.GetKey(c_leftKey) && !ViewManager.Instance.IsAnyMenuOpen) + if(Settings.Enabled && Settings.HandsExtension && Input.GetKey(Settings.LeftHandKey) && !ViewManager.Instance.IsAnyMenuOpen) m_leftHandState = HandState.Extended; } break; case HandState.Extended: { - if(!Input.GetKey(c_leftKey)) + if(!Input.GetKey(Settings.LeftHandKey)) m_leftHandState = HandState.Empty; } break; @@ -192,13 +189,13 @@ namespace ml_pam { case HandState.Empty: { - if(Settings.Enabled && Settings.HandsExtension && Input.GetKey(c_rightKey) && !ViewManager.Instance.IsAnyMenuOpen) + if(Settings.Enabled && Settings.HandsExtension && Input.GetKey(Settings.RightHandKey) && !ViewManager.Instance.IsAnyMenuOpen) m_rightHandState = HandState.Extended; } break; case HandState.Extended: { - if(!Input.GetKey(c_rightKey)) + if(!Input.GetKey(Settings.RightHandKey)) m_rightHandState = HandState.Empty; } break; diff --git a/ml_pam/Properties/AssemblyInfo.cs b/ml_pam/Properties/AssemblyInfo.cs index b6812ae..bc82f55 100644 --- a/ml_pam/Properties/AssemblyInfo.cs +++ b/ml_pam/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.2-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(1)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] diff --git a/ml_pam/Settings.cs b/ml_pam/Settings.cs index d7d5403..5ee76c3 100644 --- a/ml_pam/Settings.cs +++ b/ml_pam/Settings.cs @@ -1,6 +1,7 @@ using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; +using UnityEngine; namespace ml_pam { @@ -20,7 +21,9 @@ namespace ml_pam GrabOffset, LeadHand, HandsExtension, - ExtensionSpeed + ExtensionSpeed, + LeftHandKey, + RightHandKey } public enum LeadHand { @@ -34,6 +37,8 @@ namespace ml_pam public static LeadHand LeadingHand { get; private set; } = LeadHand.Right; public static bool HandsExtension { get; private set; } = true; public static float ExtensionSpeed { get; private set; } = 10f; + public static KeyCode LeftHandKey { get; private set; } = KeyCode.Q; + public static KeyCode RightHandKey { get; private set; } = KeyCode.E; static MelonLoader.MelonPreferences_Category ms_category = null; static List ms_entries = null; @@ -43,25 +48,34 @@ namespace ml_pam public static readonly SettingEvent OnLeadingHandChanged = new SettingEvent(); public static readonly SettingEvent OnHandsExtensionChanged = new SettingEvent(); public static readonly SettingEvent OnExtensionSpeedChanged = new SettingEvent(); + public static readonly SettingEvent OnLeftHandKeyChanged = new SettingEvent(); + public static readonly SettingEvent OnRightHandKeyChanged = new SettingEvent(); internal static void Init() { - ms_category = MelonLoader.MelonPreferences.CreateCategory("PAM", null, true); + ms_category = MelonLoader.MelonPreferences.CreateCategory("PAM", "Pickup Arm Movement"); ms_entries = new List() { - ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled), - ms_category.CreateEntry(ModSetting.GrabOffset.ToString(), (int)(GrabOffset * 100f)), - ms_category.CreateEntry(ModSetting.LeadHand.ToString(), (int)LeadHand.Right), - ms_category.CreateEntry(ModSetting.HandsExtension.ToString(), HandsExtension), - ms_category.CreateEntry(ModSetting.ExtensionSpeed.ToString(), (int)ExtensionSpeed), + ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled, null, null, true), + ms_category.CreateEntry(ModSetting.GrabOffset.ToString(), (int)(GrabOffset * 100f), null, null, true), + ms_category.CreateEntry(ModSetting.LeadHand.ToString(), (int)LeadHand.Right, null, null, true), + ms_category.CreateEntry(ModSetting.HandsExtension.ToString(), HandsExtension, null, null, true), + ms_category.CreateEntry(ModSetting.ExtensionSpeed.ToString(), (int)ExtensionSpeed, null, null, true), + ms_category.CreateEntry(ModSetting.LeftHandKey.ToString(), LeftHandKey, "Left hand key"), + ms_category.CreateEntry(ModSetting.RightHandKey.ToString(), RightHandKey, "Right hand key") }; + ms_entries[(int)ModSetting.LeftHandKey].OnEntryValueChangedUntyped.Subscribe(OnMelonSettingSave_LeftHandKey); + ms_entries[(int)ModSetting.RightHandKey].OnEntryValueChangedUntyped.Subscribe(OnMelonSettingSave_RightHandKey); + Enabled = (bool)ms_entries[(int)ModSetting.Enabled].BoxedValue; GrabOffset = (int)ms_entries[(int)ModSetting.GrabOffset].BoxedValue * 0.01f; LeadingHand = (LeadHand)(int)ms_entries[(int)ModSetting.LeadHand].BoxedValue; HandsExtension = (bool)ms_entries[(int)ModSetting.HandsExtension].BoxedValue; ExtensionSpeed = Math.Clamp((int)ms_entries[(int)ModSetting.ExtensionSpeed].BoxedValue, 1f, 50f); + LeftHandKey = (KeyCode)ms_entries[(int)ModSetting.LeftHandKey].BoxedValue; + RightHandKey = (KeyCode)ms_entries[(int)ModSetting.RightHandKey].BoxedValue; MelonLoader.MelonCoroutines.Start(WaitMainMenuUi()); } @@ -91,6 +105,38 @@ namespace ml_pam }; } + static void OnMelonSettingSave_LeftHandKey(object p_oldValue, object p_newValue) + { + try + { + if(p_newValue is KeyCode code) + { + LeftHandKey = code; + OnLeftHandKeyChanged.Invoke(LeftHandKey); + } + } + catch(Exception e) + { + MelonLoader.MelonLogger.Error(e); + } + } + + static void OnMelonSettingSave_RightHandKey(object p_oldValue, object p_newValue) + { + try + { + if(p_newValue is KeyCode code) + { + RightHandKey = code; + OnRightHandKeyChanged.Invoke(RightHandKey); + } + } + catch(Exception e) + { + MelonLoader.MelonLogger.Error(e); + } + } + static void OnToggleUpdate(string p_name, string p_value) { try diff --git a/ml_pam/ml_pam.csproj b/ml_pam/ml_pam.csproj index 55c2dec..d711c0d 100644 --- a/ml_pam/ml_pam.csproj +++ b/ml_pam/ml_pam.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 PickupArmMovement - 1.2.1 + 1.2.2 SDraw SDraw PickupArmMovement From b16d82c1f52097ed21db4eed7e42b9d50a4b936f Mon Sep 17 00:00:00 2001 From: SDraw Date: Sun, 23 Mar 2025 16:11:02 +0300 Subject: [PATCH 4/6] Fix for recent build --- ml_lme/LeapInput.cs | 4 ++-- ml_lme/Properties/AssemblyInfo.cs | 2 +- ml_lme/ml_lme.csproj | 2 +- ml_pam/ArmMover.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ml_lme/LeapInput.cs b/ml_lme/LeapInput.cs index bf76497..7fa018f 100644 --- a/ml_lme/LeapInput.cs +++ b/ml_lme/LeapInput.cs @@ -39,7 +39,7 @@ namespace ml_lme m_handRayLeft.generalMask = -269; m_handRayLeft.isInteractionRay = true; m_handRayLeft.triggerHoverEvents = false; - m_handRayLeft.holderRoot = m_handRayLeft.gameObject; + //m_handRayLeft.holderRoot = m_handRayLeft.gameObject; m_handRayLeft.attachmentDistance = 0f; m_handRayLeft.uiMask = 32; m_handRayLeft.isDesktopRay = !m_inVR; @@ -61,7 +61,7 @@ namespace ml_lme m_handRayRight.generalMask = -269; m_handRayRight.isInteractionRay = true; m_handRayRight.triggerHoverEvents = false; - m_handRayRight.holderRoot = m_handRayRight.gameObject; + //m_handRayRight.holderRoot = m_handRayRight.gameObject; m_handRayRight.attachmentDistance = 0f; m_handRayRight.uiMask = 32; m_handRayRight.isDesktopRay = !m_inVR; diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index e199a48..3f6ec3d 100644 --- a/ml_lme/Properties/AssemblyInfo.cs +++ b/ml_lme/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] diff --git a/ml_lme/ml_lme.csproj b/ml_lme/ml_lme.csproj index c983b40..58a029b 100644 --- a/ml_lme/ml_lme.csproj +++ b/ml_lme/ml_lme.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 LeapMotionExtension - 1.6.0 + 1.6.1 SDraw SDraw LeapMotionExtension diff --git a/ml_pam/ArmMover.cs b/ml_pam/ArmMover.cs index 6f3d7e8..de26757 100644 --- a/ml_pam/ArmMover.cs +++ b/ml_pam/ArmMover.cs @@ -426,7 +426,7 @@ namespace ml_pam void OnPickupGrab(CVRPickupObject p_pickup, Vector3 p_hit) { - if(p_pickup.IsGrabbedByMe && (p_pickup.ControllerRay == ViewManager.Instance.desktopControllerRay)) + if(p_pickup.IsGrabbedByMe && (p_pickup.ControllerRay == PlayerSetup.Instance.desktopRay)) { m_pickup = p_pickup; From 0921899dc851c72fcaf6b1504c4e1506967dc316 Mon Sep 17 00:00:00 2001 From: SDraw Date: Sun, 23 Mar 2025 16:50:46 +0300 Subject: [PATCH 5/6] Version difference --- README.md | 15 ----------- ml_amt/Properties/AssemblyInfo.cs | 2 +- ml_amt/ml_amt.csproj | 2 +- ml_asl/Properties/AssemblyInfo.cs | 2 +- ml_asl/ml_asl.csproj | 2 +- ml_bft/Properties/AssemblyInfo.cs | 2 +- ml_bft/ml_bft.csproj | 2 +- ml_dht/Properties/AssemblyInfo.cs | 2 +- ml_dht/ml_dht.csproj | 2 +- ml_mods_cvr.sln | 6 +++++ ml_pin/Properties/AssemblyInfo.cs | 2 +- ml_pin/ml_pin.csproj | 2 +- ml_pmc/Properties/AssemblyInfo.cs | 2 +- ml_pmc/ml_pmc.csproj | 2 +- ml_vei/Properties/AssemblyInfo.cs | 2 +- ml_vei/ml_vei.csproj | 2 +- ml_vpc/Main.cs | 26 ++++++++++++++++++ ml_vpc/Properties/AssemblyInfo.cs | 4 +++ ml_vpc/ml_vpc.csproj | 44 +++++++++++++++++++++++++++++++ 19 files changed, 94 insertions(+), 29 deletions(-) delete mode 100644 README.md create mode 100644 ml_vpc/Main.cs create mode 100644 ml_vpc/Properties/AssemblyInfo.cs create mode 100644 ml_vpc/ml_vpc.csproj diff --git a/README.md b/README.md deleted file mode 100644 index ca82063..0000000 --- a/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Merged set of MelonLoader mods for ChilloutVR. - -**Table for game build 2024r177:** -| Full name | Latest version | -|:---------:|:--------------:| -|[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)| -|[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)| -|[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_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs index 6a0913c..9343a57 100644 --- a/ml_amt/Properties/AssemblyInfo.cs +++ b/ml_amt/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_amt/ml_amt.csproj b/ml_amt/ml_amt.csproj index 99c60bc..3e387fd 100644 --- a/ml_amt/ml_amt.csproj +++ b/ml_amt/ml_amt.csproj @@ -6,7 +6,7 @@ SDraw AvatarMotionTweaker AvatarMotionTweaker - 1.5.0 + 1.51 x64 AvatarMotionTweaker diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs index 73af0e4..7af3ed9 100644 --- a/ml_asl/Properties/AssemblyInfo.cs +++ b/ml_asl/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_asl/ml_asl.csproj b/ml_asl/ml_asl.csproj index 315d2ec..8efcae7 100644 --- a/ml_asl/ml_asl.csproj +++ b/ml_asl/ml_asl.csproj @@ -7,7 +7,7 @@ SDraw SDraw AvatarSyncedLook - 1.1.0 + 1.1.1 AvatarSyncedLook diff --git a/ml_bft/Properties/AssemblyInfo.cs b/ml_bft/Properties/AssemblyInfo.cs index a6e5620..39f6312 100644 --- a/ml_bft/Properties/AssemblyInfo.cs +++ b/ml_bft/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.2-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_bft/ml_bft.csproj b/ml_bft/ml_bft.csproj index 193d9b0..76bea89 100644 --- a/ml_bft/ml_bft.csproj +++ b/ml_bft/ml_bft.csproj @@ -7,7 +7,7 @@ SDraw SDraw BetterFingersTracking - 1.1.1 + 1.1.2 BetterFingersTracking diff --git a/ml_dht/Properties/AssemblyInfo.cs b/ml_dht/Properties/AssemblyInfo.cs index 6e7dc23..2c55ca2 100644 --- a/ml_dht/Properties/AssemblyInfo.cs +++ b/ml_dht/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] \ No newline at end of file diff --git a/ml_dht/ml_dht.csproj b/ml_dht/ml_dht.csproj index cfca6d6..e336875 100644 --- a/ml_dht/ml_dht.csproj +++ b/ml_dht/ml_dht.csproj @@ -6,7 +6,7 @@ SDraw SDraw DesktopHeadTracking - 1.3.0 + 1.3.1 x64 DesktopHeadTracking diff --git a/ml_mods_cvr.sln b/ml_mods_cvr.sln index 38819c7..7f4868e 100644 --- a/ml_mods_cvr.sln +++ b/ml_mods_cvr.sln @@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_dht", "ml_dht\ml_dht.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_bft", "ml_bft\ml_bft.csproj", "{331C995D-9648-44AD-8B02-D5F3A89FDC1F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vpc", "ml_vpc\ml_vpc.csproj", "{A0461752-5D20-4E9C-B6EA-865E2C0ED137}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -65,6 +67,10 @@ Global {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Debug|x64.ActiveCfg = Debug|x64 {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Release|x64.ActiveCfg = Release|x64 {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Release|x64.Build.0 = Release|x64 + {A0461752-5D20-4E9C-B6EA-865E2C0ED137}.Debug|x64.ActiveCfg = Debug|x64 + {A0461752-5D20-4E9C-B6EA-865E2C0ED137}.Debug|x64.Build.0 = Debug|x64 + {A0461752-5D20-4E9C-B6EA-865E2C0ED137}.Release|x64.ActiveCfg = Release|x64 + {A0461752-5D20-4E9C-B6EA-865E2C0ED137}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ml_pin/Properties/AssemblyInfo.cs b/ml_pin/Properties/AssemblyInfo.cs index 5989421..3061742 100644 --- a/ml_pin/Properties/AssemblyInfo.cs +++ b/ml_pin/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_pin/ml_pin.csproj b/ml_pin/ml_pin.csproj index 5cd62d8..89476bf 100644 --- a/ml_pin/ml_pin.csproj +++ b/ml_pin/ml_pin.csproj @@ -7,7 +7,7 @@ SDraw SDraw PlayersInstanceNotifier - 1.1.0 + 1.1.1 PlayersInstanceNotifier diff --git a/ml_pmc/Properties/AssemblyInfo.cs b/ml_pmc/Properties/AssemblyInfo.cs index 10017ca..66d19b1 100644 --- a/ml_pmc/Properties/AssemblyInfo.cs +++ b/ml_pmc/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(3)] [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")] diff --git a/ml_pmc/ml_pmc.csproj b/ml_pmc/ml_pmc.csproj index 5c83c12..939e5fd 100644 --- a/ml_pmc/ml_pmc.csproj +++ b/ml_pmc/ml_pmc.csproj @@ -7,7 +7,7 @@ SDraw SDraw PlayerMovementCopycat - 1.1.0 + 1.1.1 PlayerMovementCopycat diff --git a/ml_vei/Properties/AssemblyInfo.cs b/ml_vei/Properties/AssemblyInfo.cs index 1fab4f8..60eea56 100644 --- a/ml_vei/Properties/AssemblyInfo.cs +++ b/ml_vei/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.1.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.1.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_vei/ml_vei.csproj b/ml_vei/ml_vei.csproj index 27ea5cd..c041c49 100644 --- a/ml_vei/ml_vei.csproj +++ b/ml_vei/ml_vei.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 ViveExtendedInput - 1.1.0 + 1.1.1 SDraw SDraw ViveExtendedInput diff --git a/ml_vpc/Main.cs b/ml_vpc/Main.cs new file mode 100644 index 0000000..547f1f2 --- /dev/null +++ b/ml_vpc/Main.cs @@ -0,0 +1,26 @@ +using ABI_RC.VideoPlayer; +using System.Reflection; +using System.IO; + +namespace ml_vpc +{ + public class VideoPlayerCookies : MelonLoader.MelonMod + { + static string ms_cookiesPath; + + public override void OnInitializeMelon() + { + HarmonyInstance.Patch(typeof(YoutubeDl).GetMethod("GetVideoMetaDataAsync", BindingFlags.NonPublic | BindingFlags.Static), + new HarmonyLib.HarmonyMethod(typeof(VideoPlayerCookies).GetMethod(nameof(OnGetYoutubeVideoMetaData_Prefix), BindingFlags.NonPublic | BindingFlags.Static)) + ); + + ms_cookiesPath = Path.Combine(MelonLoader.Utils.MelonEnvironment.UserDataDirectory, "cookies.txt"); + } + + static void OnGetYoutubeVideoMetaData_Prefix(ref string parameter) + { + if(File.Exists(ms_cookiesPath)) + parameter += string.Format(" --cookies \"{0}\"", ms_cookiesPath); + } + } +} diff --git a/ml_vpc/Properties/AssemblyInfo.cs b/ml_vpc/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8a755eb --- /dev/null +++ b/ml_vpc/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +[assembly: MelonLoader.MelonInfo(typeof(ml_vpc.VideoPlayerCookies), "VideoPlayerCookies", "1.0.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] +[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] +[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_vpc/ml_vpc.csproj b/ml_vpc/ml_vpc.csproj new file mode 100644 index 0000000..45e855e --- /dev/null +++ b/ml_vpc/ml_vpc.csproj @@ -0,0 +1,44 @@ + + + + netstandard2.1 + x64 + VideoPlayerCookies + SDraw + SDraw + 1.0.1 + + + + embedded + true + + + + + + + + + D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll + false + false + + + D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + false + false + + + D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll + false + false + + + D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + false + false + + + + From 71a09df17d84a1b678e55b03ccc1c3cf90a0079b Mon Sep 17 00:00:00 2001 From: SDraw Date: Wed, 2 Apr 2025 22:27:59 +0300 Subject: [PATCH 6/6] Fix for latest build --- ml_lme/LeapInput.cs | 2 +- ml_pmc/PoseCopycat.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ml_lme/LeapInput.cs b/ml_lme/LeapInput.cs index 7fa018f..7790bd3 100644 --- a/ml_lme/LeapInput.cs +++ b/ml_lme/LeapInput.cs @@ -383,7 +383,7 @@ namespace ml_lme } // Reset to default - SetGameFingersTracking(m_inVR && Utils.AreKnucklesInUse() && !CVRInputManager._moduleXR.GestureToggleValue); + SetGameFingersTracking(m_inVR && Utils.AreKnucklesInUse() && !CVRInputManager._moduleXR.SkeletalToggleValue); } OnInteractionChanged(Settings.Interaction); diff --git a/ml_pmc/PoseCopycat.cs b/ml_pmc/PoseCopycat.cs index 8ac5f94..de9e1c1 100644 --- a/ml_pmc/PoseCopycat.cs +++ b/ml_pmc/PoseCopycat.cs @@ -424,7 +424,7 @@ namespace ml_pmc } void RestoreFingerTracking() { - CVRInputManager.Instance.individualFingerTracking = (m_inVr && Utils.AreKnucklesInUse() && !CVRInputManager._moduleXR.GestureToggleValue); + CVRInputManager.Instance.individualFingerTracking = (m_inVr && Utils.AreKnucklesInUse() && !CVRInputManager._moduleXR.SkeletalToggleValue); IKSystem.Instance.FingerSystem.controlActive = CVRInputManager.Instance.individualFingerTracking; if(!CVRInputManager.Instance.individualFingerTracking)