Merge pull request #149 from whateverusername0/bleeding-edge

0.19 real
whateverusername0 · Jan 25, 2024 · c2bbc2c · c2bbc2c
2 parents d275ee5 + 3521474
commit c2bbc2c
Show file tree

Hide file tree

Showing 36 changed files with 270 additions and 199 deletions.
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Assembly-CSharp.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Assembly-CSharp.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Assembly-CSharp_nonpublicized.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Assembly-CSharp_nonpublicized.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/0Harmony.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/0Harmony.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/0Harmony20.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/0Harmony20.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.Harmony.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.Harmony.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.Preloader.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.Preloader.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/BepInEx.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/HarmonyXInterop.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/HarmonyXInterop.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Mdb.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Mdb.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Pdb.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Pdb.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Rocks.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.Rocks.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/Mono.Cecil.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/MonoMod.RuntimeDetour.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/MonoMod.RuntimeDetour.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/MonoMod.Utils.dll b/VRTRAKILL.Plugin/Plugin/Libraries/BepInEx/MonoMod.Utils.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/ModSupport/PluginConfigurator.dll b/VRTRAKILL.Plugin/Plugin/Libraries/ModSupport/PluginConfigurator.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Newtonsoft.Json.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Newtonsoft.Json.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/SteamVR/SteamVR.dll b/VRTRAKILL.Plugin/Plugin/Libraries/SteamVR/SteamVR.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/SteamVR/SteamVR_Actions.dll b/VRTRAKILL.Plugin/Plugin/Libraries/SteamVR/SteamVR_Actions.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/Unity.InputSystem.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/Unity.InputSystem.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AnimationModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AnimationModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AssetBundleModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AssetBundleModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AudioModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.AudioModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.CoreModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.CoreModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.InputLegacyModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.InputLegacyModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.InputModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.InputModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.PhysicsModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.PhysicsModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.UI.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.UI.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.UIModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.UIModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.VRModule.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.VRModule.dll
diff --git a/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.dll b/VRTRAKILL.Plugin/Plugin/Libraries/Unity/UnityEngine.dll
diff --git a/VRTRAKILL.Plugin/Plugin/ULTRAKILL/Arms/Patches/PunchP.cs b/VRTRAKILL.Plugin/Plugin/ULTRAKILL/Arms/Patches/PunchP.cs
diff --git a/VRTRAKILL.Plugin/Plugin/ULTRAKILL/VRAvatar/IKFoot.cs b/VRTRAKILL.Plugin/Plugin/ULTRAKILL/VRAvatar/IKFoot.cs
@@ -34,7 +34,7 @@ public void Start()
         public void Update()
         {
             if ((Anim?.GetBool("Jumping") == true || Anim?.GetBool("Sliding") == true) // animations
-            || (Input.InputVars.MoveVector.magnitude < Vars.Config.Controllers.Deadzone && NewMovement.Instance.rb.velocity.magnitude > 0)) // moving platforms fix
+            || (NewMovement.Instance.rb.velocity.magnitude > Vector3.kEpsilon && !NewMovement.Instance.walking)) // moving platforms
             {
                 transform.localPosition = LastFootPos;
                 return;

diff --git a/VRTRAKILL.Plugin/Plugin/ULTRAKILL/VRPlayer/VRKeybindsController.cs b/VRTRAKILL.Plugin/Plugin/ULTRAKILL/VRPlayer/VRKeybindsController.cs
@@ -21,7 +21,7 @@ public void Update()
                 try
                 {
                     if ((bool)(VRAvatar.AvatarSizeAdjustor.Instance?.enabled))
-                        ULTRAKILL.VRAvatar.AvatarSizeAdjustor.Instance.enabled = false;
+                        VRAvatar.AvatarSizeAdjustor.Instance.enabled = false;
                     else if ((bool)!VRAvatar.AvatarSizeAdjustor.Instance?.enabled)
                         VRAvatar.AvatarSizeAdjustor.Instance.enabled = true;
                 } catch (System.NullReferenceException) { SubtitleController.Instance.DisplaySubtitle("Unable to toggle avatar size adjustment!"); }

diff --git a/VRTRAKILL.Plugin/Plugin/VRTRAKILL.Plugin.csproj b/VRTRAKILL.Plugin/Plugin/VRTRAKILL.Plugin.csproj
@@ -26,59 +26,59 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony">
-      <HintPath>Libraries\BepInEx\0Harmony.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>Libraries\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\lib\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx">
-      <HintPath>Libraries\BepInEx\BepInEx.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\BepInEx.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx.Harmony">
-      <HintPath>Libraries\BepInEx\BepInEx.Harmony.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\BepInEx.Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx.Preloader">
-      <HintPath>Libraries\BepInEx\BepInEx.Preloader.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\BepInEx.Preloader.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="HarmonyXInterop">
-      <HintPath>Libraries\BepInEx\HarmonyXInterop.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\HarmonyXInterop.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil">
-      <HintPath>Libraries\BepInEx\Mono.Cecil.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\Mono.Cecil.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>Libraries\BepInEx\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\Mono.Cecil.Mdb.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>Libraries\BepInEx\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\Mono.Cecil.Pdb.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>Libraries\BepInEx\Mono.Cecil.Rocks.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\Mono.Cecil.Rocks.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MonoMod.RuntimeDetour">
-      <HintPath>Libraries\BepInEx\MonoMod.RuntimeDetour.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\MonoMod.RuntimeDetour.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MonoMod.Utils">
-      <HintPath>Libraries\BepInEx\MonoMod.Utils.dll</HintPath>
+      <HintPath>..\..\lib\BepInEx\MonoMod.Utils.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">
@@ -101,51 +101,51 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="Unity.InputSystem">
-      <HintPath>Libraries\Unity\Unity.InputSystem.dll</HintPath>
+      <HintPath>..\..\lib\Unity\Unity.InputSystem.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>Libraries\Unity\UnityEngine.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>Libraries\Unity\UnityEngine.AnimationModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.AnimationModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>Libraries\Unity\UnityEngine.AssetBundleModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.AssetBundleModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.AudioModule">
-      <HintPath>Libraries\Unity\UnityEngine.AudioModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.AudioModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>Libraries\Unity\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.InputLegacyModule">
-      <HintPath>Libraries\Unity\UnityEngine.InputLegacyModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.InputLegacyModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.InputModule">
-      <HintPath>Libraries\Unity\UnityEngine.InputModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.InputModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>Libraries\Unity\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.PhysicsModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>Libraries\Unity\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UIModule">
-      <HintPath>Libraries\Unity\UnityEngine.UIModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.UIModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.VRModule">
-      <HintPath>Libraries\Unity\UnityEngine.VRModule.dll</HintPath>
+      <HintPath>..\..\lib\Unity\UnityEngine.VRModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>

diff --git a/lib/Assembly-CSharp.dll b/lib/Assembly-CSharp.dll
diff --git a/lib/Assembly-CSharp_nonpublicized.dll b/lib/Assembly-CSharp_nonpublicized.dll