diff --git a/README.md b/README.md index 47e08bc..a0078dc 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ Merged set of MelonLoader mods for ChilloutVR. -**Table for game build 2025r179:** +**Table for nightly game build 2025r180:** | Full name | Latest version | |:---------:|:--------------:| -|[Avatar Motion Tweaker](/ml_amt/README.md)|1.5.1 [:arrow_down:](../../releases/latest/download/AvatarMotionTweaker.dll)| -|[Avatar Synced Look](/ml_asl/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/AvatarSyncedLook.dll)| -|[Better Fingers Tracking](/ml_bft/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/BetterFingersTracking.dll)| -|[Leap Motion Extension](/ml_lme/README.md)| 1.6.1 [:arrow_down:](../../releases/latest/download/LeapMotionExtension.dll)| -|[Pickup Arm Movement](/ml_pam/README.md)|1.2.2 [:arrow_down:](../../releases/latest/download/PickupArmMovement.dll)| -|[Players Instance Notifier](/ml_pin/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/PlayersInstanceNotifier.dll)| -|[Player Movement Copycat](/ml_pmc/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/PlayerMovementCopycat.dll)| -|[Player Pick Up](/ml_ppu/README.md)|1.0.0 [:arrow_down:](../../releases/latest/download/PlayerPickUp.dll)| -|[Player Ragdoll Mod](/ml_prm/README.md)|1.2.3 [:arrow_down:](../../releases/latest/download/PlayerRagdollMod.dll)| -|[Video Player Cookies](/ml_vpc/README.md)|1.0.1 [:arrow_down:](../../releases/latest/download/VideoPlayerCookies.dll)| -|[Vive Extended Input](/ml_vei/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/ViveExtendedInput.dll)| +|[Avatar Motion Tweaker](/ml_amt/README.md)|1.5.2 [:arrow_down:](../../releases/latest/download/r180n/AvatarMotionTweaker.dll)| +|[Avatar Synced Look](/ml_asl/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/r180n/AvatarSyncedLook.dll)| +|[Better Fingers Tracking](/ml_bft/README.md)|1.1.3 [:arrow_down:](../../releases/latest/download/r180n/BetterFingersTracking.dll)| +|[Leap Motion Extension](/ml_lme/README.md)| 1.6.2 [:arrow_down:](../../releases/latest/download/r180n/LeapMotionExtension.dll)| +|[Pickup Arm Movement](/ml_pam/README.md)|1.2.3 [:arrow_down:](../../releases/latest/download/r180n/PickupArmMovement.dll)| +|[Players Instance Notifier](/ml_pin/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/r180n/PlayersInstanceNotifier.dll)| +|[Player Movement Copycat](/ml_pmc/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/r180n/PlayerMovementCopycat.dll)| +|[Player Pick Up](/ml_ppu/README.md)|1.0.1 [:arrow_down:](../../releases/latest/download/r180n/PlayerPickUp.dll)| +|[Player Ragdoll Mod](/ml_prm/README.md)|1.2.4 [:arrow_down:](../../releases/latest/download/r180n/PlayerRagdollMod.dll)| +|[Vive Extended Input](/ml_vei/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/r180n/ViveExtendedInput.dll)| +|[Video Player Cookies](/ml_vpc/README.md)|1.0.2 [:arrow_down:](../../releases/latest/download/r180n/VideoPlayerCookies.dll)| diff --git a/archived/ml_dht/Properties/AssemblyInfo.cs b/archived/ml_dht/Properties/AssemblyInfo.cs index 07cc9e9..d2beaa7 100644 --- a/archived/ml_dht/Properties/AssemblyInfo.cs +++ b/archived/ml_dht/Properties/AssemblyInfo.cs @@ -1,19 +1,4 @@ -using System.Reflection; -using ml_dht.Properties; - -[assembly: AssemblyVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyTitle(nameof(ml_dht.DesktopHeadTracking))] -[assembly: AssemblyCompany(AssemblyInfoParams.Author)] -[assembly: AssemblyProduct(nameof(ml_dht.DesktopHeadTracking))] - +[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.4", "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)] - -namespace ml_dht.Properties; -internal static class AssemblyInfoParams { - public const string Version = "1.3.4"; - public const string Author = "SDraw"; -} diff --git a/archived/ml_dht/ml_dht.csproj b/archived/ml_dht/ml_dht.csproj index e148b1d..14161da 100644 --- a/archived/ml_dht/ml_dht.csproj +++ b/archived/ml_dht/ml_dht.csproj @@ -1,22 +1,85 @@ - DesktopHeadTracking + netstandard2.1 DesktopHeadTracking + SDraw + SDraw DesktopHeadTracking + 1.3.4 + x64 + DesktopHeadTracking + + + + x64 + 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\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll + false + false + + + D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll + false + false + + + D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.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.dll + false + false + + + D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll + false + false + + + D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + false + false + + + + + + + diff --git a/archived/ml_vet/Properties/AssemblyInfo.cs b/archived/ml_vet/Properties/AssemblyInfo.cs index 5441d1e..34e2814 100644 --- a/archived/ml_vet/Properties/AssemblyInfo.cs +++ b/archived/ml_vet/Properties/AssemblyInfo.cs @@ -1,26 +1,4 @@ -using System.Reflection; -using ml_vet.Properties; - -[assembly: AssemblyVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyTitle(nameof(ml_vet.ViveEyeTracking))] -[assembly: AssemblyCompany(AssemblyInfoParams.Author)] -[assembly: AssemblyProduct(nameof(ml_vet.ViveEyeTracking))] - -[assembly: MelonLoader.MelonInfo( - typeof(ml_vet.ViveEyeTracking), - nameof(ml_vet.ViveEyeTracking), - AssemblyInfoParams.Version, - AssemblyInfoParams.Author, - "https://github.com/SDraw/ml_mods_cvr" -)] +[assembly: MelonLoader.MelonInfo(typeof(ml_vet.ViveEyeTracking), "ViveEyeTracking", "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)] - -namespace ml_vet.Properties; -internal static class AssemblyInfoParams { - public const string Version = "1.0.2"; - public const string Author = "SDraw"; -} diff --git a/archived/ml_vet/ml_vet.csproj b/archived/ml_vet/ml_vet.csproj index 1839253..724204e 100644 --- a/archived/ml_vet/ml_vet.csproj +++ b/archived/ml_vet/ml_vet.csproj @@ -1,18 +1,70 @@ - ViveEyeTracking + netstandard2.1 + x64 ViveEyeTracking + 1.0.2 + SDraw + SDraw ViveEyeTracking + ViveEyeTracking + + + + embedded + true + TRACE;NIGHTLY_BUILD - + - - + + + + + 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\ChilloutVR_Data\Managed\cohtml.Net.dll + false + false + + + D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.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.dll + false + false + + + D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + false + false + + + + + + diff --git a/ml_mods_cvr.sln b/ml_mods_cvr.sln index 6e8eb6f..8f264ac 100644 --- a/ml_mods_cvr.sln +++ b/ml_mods_cvr.sln @@ -19,13 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_asl", "ml_asl/ml_asl.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pin", "ml_pin/ml_pin.csproj", "{7E493C28-7202-46F8-9789-D6C6FF7E5241}" 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", "{7CF37B93-9341-422D-845C-9AB96DB4D0A1}" +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_ppu", "ml_ppu/ml_ppu.csproj", "{F16DF16B-D127-4A2A-81FF-2FD80F320E64}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ml_pah", "ml_pah/ml_pah.csproj", "{C4659F60-3FED-4F43-88E4-969907D4C7A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_ppu", "ml_ppu\ml_ppu.csproj", "{F16DF16B-D127-4A2A-81FF-2FD80F320E64}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pah", "ml_pah\ml_pah.csproj", "{C4659F60-3FED-4F43-88E4-969907D4C7A6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index a3c4da9..5da43fd 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -347,6 +347,7 @@ namespace ml_prm BipedRagdollCreator.Options l_options = BipedRagdollCreator.AutodetectOptions(m_puppetReferences); l_options.joints = RagdollCreator.JointType.Character; + l_options.fixFootColliderRotation = false; BipedRagdollCreator.Create(m_puppetReferences, l_options); Transform[] l_puppetTransforms = m_puppetReferences.GetRagdollTransforms();