diff --git a/README.md b/README.md index 5c860ea..2595306 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ Merged set of MelonLoader mods for ChilloutVR. -**Table for game build 2023r173:** +**Table for game build 2023r175:** | Full name | Short name | Latest version | Available in [CVRMA](https://github.com/knah/CVRMelonAssistant) | |:---------:|:----------:|:--------------:| :----------------------------------------------------------------| -| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.7 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| Yes | -| [Avatar Synced Look](/ml_asl/README.md) | ml_asl | 1.0.1 [:arrow_down:](../../releases/latest/download/ml_asl.dll)| Yes | -| [Better Fingers Tracking](/ml_bft/README.md) | ml_bft | 1.0.0 [:arrow_down:](../../releases/latest/download/ml_bft.dll)| Yes
Update review | -| [Desktop Head Tracking](/ml_dht/README.md) | ml_dht | 1.2.1 [:arrow_down:](../../releases/latest/download/ml_dht.dll) | Yes | -| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.7 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| Yes
Update review | -| [Pickup Arm Movement](/ml_pam/README.md)| ml_pam | 1.1.0 [:arrow_down:](../../releases/latest/download/ml_pam.dll)| Yes | -| [Player Movement Copycat](/ml_pmc/README.md)| ml_pmc | 1.0.5 [:arrow_down:](../../releases/latest/download/ml_pmc.dll)| Yes | -| [Player Ragdoll Mod](/ml_prm/README.md) | ml_prm | 1.1.3 [:arrow_down:](../../releases/latest/download/ml_prm.dll)| Yes | -| [Players Instance Notifier](/ml_pin/README.md) | ml_pin | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_ml_pin.dll)| Yes | -| [Vive Extended Input](/ml_vei/README.md) | ml_vei | 1.0.1 [:arrow_down:](../../releases/latest/download/ml_vei.dll)| Yes | +| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.8 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| Yes
Update review | +| [Avatar Synced Look](/ml_asl/README.md) | ml_asl | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_asl.dll)| Yes
Update review | +| [Better Fingers Tracking](/ml_bft/README.md) | ml_bft | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_bft.dll)| Yes
Update review | +| [Desktop Head Tracking](/ml_dht/README.md) | ml_dht | 1.2.2 [:arrow_down:](../../releases/latest/download/ml_dht.dll) | Yes
Update review | +| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.8 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| Yes
Update review | +| [Pickup Arm Movement](/ml_pam/README.md)| ml_pam | 1.1.1 [:arrow_down:](../../releases/latest/download/ml_pam.dll)| Yes
Update review | +| [Player Movement Copycat](/ml_pmc/README.md)| ml_pmc | 1.0.6 [:arrow_down:](../../releases/latest/download/ml_pmc.dll)| Yes
Update review | +| [Player Ragdoll Mod](/ml_prm/README.md) | ml_prm | 1.1.4 [:arrow_down:](../../releases/latest/download/ml_prm.dll)| Yes
Update review | +| [Players Instance Notifier](/ml_pin/README.md) | ml_pin | 1.0.3 [:arrow_down:](../../releases/latest/download/ml_ml_pin.dll)| Yes
Update review | +| [Vive Extended Input](/ml_vei/README.md) | ml_vei | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_vei.dll)| Yes
Update review | **Archived mods:** | Full name | Short name | Notes | diff --git a/ml_amt/AvatarParameter.cs b/ml_amt/AvatarParameter.cs index 5307c70..8553803 100644 --- a/ml_amt/AvatarParameter.cs +++ b/ml_amt/AvatarParameter.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core.Util.AnimatorManager; using System.Text.RegularExpressions; using UnityEngine; @@ -16,16 +16,16 @@ namespace ml_amt readonly int m_hash = 0; readonly bool m_sync; readonly AnimatorControllerParameterType m_innerType; - readonly CVRAnimatorManager m_manager = null; + readonly AvatarAnimatorManager m_manager = null; - public AvatarParameter(ParameterType p_type, CVRAnimatorManager p_manager) + public AvatarParameter(ParameterType p_type, AvatarAnimatorManager p_manager) { m_type = p_type; m_name = p_type.ToString(); m_manager = p_manager; Regex l_regex = new Regex("^#?" + m_name + '$'); - foreach(var l_param in m_manager.animator.parameters) + foreach(var l_param in m_manager.Animator.parameters) { if(l_regex.IsMatch(l_param.name)) { @@ -55,9 +55,9 @@ namespace ml_amt if(m_innerType == AnimatorControllerParameterType.Float) { if(m_sync) - m_manager.SetAnimatorParameterFloat(m_name, p_value); + m_manager.SetParameter(m_name, p_value); else - m_manager.animator.SetFloat(m_hash, p_value); + m_manager.Animator.SetFloat(m_hash, p_value); } } @@ -66,9 +66,9 @@ namespace ml_amt if(m_innerType == AnimatorControllerParameterType.Bool) { if(m_sync) - m_manager.SetAnimatorParameterBool(m_name, p_value); + m_manager.SetParameter(m_name, p_value); else - m_manager.animator.SetBool(m_hash, p_value); + m_manager.Animator.SetBool(m_hash, p_value); } } } diff --git a/ml_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs index 4273301..173b71c 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.3.7-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.8", "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 195a72c..14f81ca 100644 --- a/ml_amt/ml_amt.csproj +++ b/ml_amt/ml_amt.csproj @@ -6,7 +6,7 @@ None AvatarMotionTweaker AvatarMotionTweaker - 1.3.7 + 1.3.8 x64 ml_amt diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs index e8255cb..8b201f5 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.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.0.2", "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 ceeab33..3e00a97 100644 --- a/ml_asl/ml_asl.csproj +++ b/ml_asl/ml_asl.csproj @@ -7,7 +7,7 @@ SDraw None AvatarSyncedLook - 1.0.1 + 1.0.2 diff --git a/ml_bft/Properties/AssemblyInfo.cs b/ml_bft/Properties/AssemblyInfo.cs index 37f96a9..d5f1eae 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.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.0.2", "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 0869bde..102f8ff 100644 --- a/ml_bft/ml_bft.csproj +++ b/ml_bft/ml_bft.csproj @@ -7,7 +7,7 @@ SDraw None BetterFingersTracking - 1.0.1 + 1.0.2 diff --git a/ml_dht/Properties/AssemblyInfo.cs b/ml_dht/Properties/AssemblyInfo.cs index fcd70ab..3b78941 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.2.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.2.2", "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 cc35d26..7b3c1c1 100644 --- a/ml_dht/ml_dht.csproj +++ b/ml_dht/ml_dht.csproj @@ -6,7 +6,7 @@ SDraw None DesktopHeadTracking - 1.2.1 + 1.2.2 x64 diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index 5de9a18..e760c52 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.4.7-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.4.8", "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 cb0ccc9..e7ac10b 100644 --- a/ml_lme/ml_lme.csproj +++ b/ml_lme/ml_lme.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 LeapMotionExtension - 1.4.7 + 1.4.8 SDraw None LeapMotionExtension diff --git a/ml_pam/Properties/AssemblyInfo.cs b/ml_pam/Properties/AssemblyInfo.cs index 9bd9a57..27a1983 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.1.0-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.1.1", "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/ml_pam.csproj b/ml_pam/ml_pam.csproj index 1decd72..e9dad99 100644 --- a/ml_pam/ml_pam.csproj +++ b/ml_pam/ml_pam.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 PickupArmMovement - 1.1.0 + 1.1.1 SDraw None PickupArmMovement diff --git a/ml_pin/Properties/AssemblyInfo.cs b/ml_pin/Properties/AssemblyInfo.cs index e432677..1f7d353 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.0.2-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.0.3", "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 bbb4d30..8cd1b16 100644 --- a/ml_pin/ml_pin.csproj +++ b/ml_pin/ml_pin.csproj @@ -7,7 +7,7 @@ SDraw None PlayersInstanceNotifier - 1.0.2 + 1.0.3 diff --git a/ml_pmc/PoseCopycat.cs b/ml_pmc/PoseCopycat.cs index 59edb7c..a47734e 100644 --- a/ml_pmc/PoseCopycat.cs +++ b/ml_pmc/PoseCopycat.cs @@ -312,9 +312,9 @@ namespace ml_pmc { if(!m_active) { - if((p_target != null) && (p_target.animatorManager != null) && (p_target.animatorManager.animator != null) && p_target.animatorManager.animator.isHuman) + if((p_target != null) && (p_target.animatorManager != null) && (p_target.animatorManager.Animator != null) && p_target.animatorManager.Animator.isHuman) { - m_puppetParser = p_target.animatorManager.animator.gameObject.AddComponent(); + m_puppetParser = p_target.animatorManager.Animator.gameObject.AddComponent(); m_puppetParser.m_puppetMaster = p_target; m_distanceLimit = Utils.GetWorldMovementLimit(); diff --git a/ml_pmc/Properties/AssemblyInfo.cs b/ml_pmc/Properties/AssemblyInfo.cs index 518b369..e73122e 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.0.5-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.0.6", "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 75ac2cb..9a91b2a 100644 --- a/ml_pmc/ml_pmc.csproj +++ b/ml_pmc/ml_pmc.csproj @@ -7,7 +7,7 @@ SDraw None PlayerMovementCopycat - 1.0.5 + 1.0.6 diff --git a/ml_prm/AvatarBoolParameter.cs b/ml_prm/AvatarBoolParameter.cs index f7c7949..ee40a63 100644 --- a/ml_prm/AvatarBoolParameter.cs +++ b/ml_prm/AvatarBoolParameter.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core.Util.AnimatorManager; using System.Text.RegularExpressions; using UnityEngine; @@ -9,15 +9,15 @@ namespace ml_prm public readonly string m_name; public readonly int m_hash = 0; public readonly bool m_sync; - readonly CVRAnimatorManager m_manager = null; + readonly AvatarAnimatorManager m_manager = null; - public AvatarBoolParameter(string p_name, CVRAnimatorManager p_manager) + public AvatarBoolParameter(string p_name, AvatarAnimatorManager p_manager) { m_name = p_name; m_manager = p_manager; Regex l_regex = new Regex("^#?" + p_name + '$'); - foreach(var l_param in m_manager.animator.parameters) + foreach(var l_param in m_manager.Animator.parameters) { if(l_regex.IsMatch(l_param.name) && (l_param.type == AnimatorControllerParameterType.Bool)) { @@ -34,9 +34,9 @@ namespace ml_prm if(m_hash != 0) { if(m_sync) - m_manager.SetAnimatorParameterBool(m_name, p_value); + m_manager.SetParameter(m_name, p_value); else - m_manager.animator.SetBool(m_hash, p_value); + m_manager.Animator.SetBool(m_hash, p_value); } } } diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs index 3b540bd..6141cae 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.1.3-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.1.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(2)] [assembly: MelonLoader.MelonOptionalDependencies("BTKUILib")] diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index dc38bc4..c87f624 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -644,7 +644,7 @@ namespace ml_prm m_applyHipsRotation = IKSystem.Instance.applyOriginalHipRotation; IKSystem.Instance.applyOriginalHipRotation = true; - PlayerSetup.Instance.animatorManager.SetAnimatorParameterTrigger("CancelEmote"); + PlayerSetup.Instance.animatorManager.CancelEmote = true; m_ragdolledParameter.SetValue(true); if(!Utils.IsWorldSafe()) diff --git a/ml_prm/ml_prm.csproj b/ml_prm/ml_prm.csproj index 9b23b10..c16a89f 100644 --- a/ml_prm/ml_prm.csproj +++ b/ml_prm/ml_prm.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 PlayerRagdollMod - 1.1.3 + 1.1.4 SDraw None PlayerRagdollMod diff --git a/ml_vei/Properties/AssemblyInfo.cs b/ml_vei/Properties/AssemblyInfo.cs index 4acacf8..e685211 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.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.0.2", "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 f1eb3b8..42039df 100644 --- a/ml_vei/ml_vei.csproj +++ b/ml_vei/ml_vei.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 ViveExtendedInput - 1.0.1 + 1.0.2 SDraw None ViveExtendedInput