diff --git a/Mirror/Telepathy.dll b/Mirror/Telepathy.dll new file mode 100644 index 00000000..f74a354e Binary files /dev/null and b/Mirror/Telepathy.dll differ diff --git a/QSB/AssetBundles/conversation b/QSB/AssetBundles/conversation index 0fdf8e08..82bf2cc2 100644 Binary files a/QSB/AssetBundles/conversation and b/QSB/AssetBundles/conversation differ diff --git a/QSB/AssetBundles/conversation.manifest b/QSB/AssetBundles/conversation.manifest index a1868f7b..060bc735 100644 --- a/QSB/AssetBundles/conversation.manifest +++ b/QSB/AssetBundles/conversation.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3354188065 +CRC: 2158942079 Hashes: AssetFileHash: serializedVersion: 2 - Hash: fb75719e1b1bec6204517cda4d9269ef + Hash: 630c69c36ad225d832a6c4a83e60f3d6 TypeTreeHash: serializedVersion: 2 - Hash: 10c572b2fffaafd2c2e3acf31b3d2fc4 + Hash: 0b6dcb0adf46bff667535938056e8d8d HashAppended: 0 ClassTypes: - Class: 1 @@ -18,17 +18,17 @@ ClassTypes: - Class: 48 Script: {instanceID: 0} - Class: 114 - Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + Script: {fileID: 1015169618, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + Script: {fileID: 602583937, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + Script: {fileID: 1980459831, guid: 106784ef860579a438677482e738fed4, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + Script: {fileID: 1741964061, guid: 106784ef860579a438677482e738fed4, type: 3} - Class: 114 - Script: {fileID: 1015169618, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -765806418, guid: 106784ef860579a438677482e738fed4, type: 3} - Class: 114 - Script: {fileID: 602583937, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 708705254, guid: 106784ef860579a438677482e738fed4, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 128 diff --git a/QSB/AssetBundles/debug.manifest b/QSB/AssetBundles/debug.manifest index bc6328f9..703e9701 100644 --- a/QSB/AssetBundles/debug.manifest +++ b/QSB/AssetBundles/debug.manifest @@ -3,7 +3,7 @@ CRC: 1531115438 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 2a8d201cb789a973973d7aa0776c2d68 + Hash: 69af2ff9e30a3a4e0f059dc00ea13d16 TypeTreeHash: serializedVersion: 2 Hash: ae2cf77de671e115b4e55d2b65767202 diff --git a/QSB/AssetBundles/instruments.manifest b/QSB/AssetBundles/instruments.manifest index 62eef2d8..10973aa7 100644 --- a/QSB/AssetBundles/instruments.manifest +++ b/QSB/AssetBundles/instruments.manifest @@ -3,7 +3,7 @@ CRC: 443713126 Hashes: AssetFileHash: serializedVersion: 2 - Hash: f5f7e2baaa8ede1da17deb579ea77ffd + Hash: 7d0ca7d72c1b77d3f455afb9deb14138 TypeTreeHash: serializedVersion: 2 Hash: a1e72967751de663a1cbd29bd1e98be5 diff --git a/QSB/AssetBundles/network b/QSB/AssetBundles/network index 8e58b730..ea5af79b 100644 Binary files a/QSB/AssetBundles/network and b/QSB/AssetBundles/network differ diff --git a/QSB/AssetBundles/network.manifest b/QSB/AssetBundles/network.manifest index 754437d0..7b414ddc 100644 --- a/QSB/AssetBundles/network.manifest +++ b/QSB/AssetBundles/network.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3845994459 +CRC: 239361177 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 9533a5dbb791bfc59b79819e0aba65e4 + Hash: 3e6ecb7ed7ae569b3b561b9c1998ab56 TypeTreeHash: serializedVersion: 2 - Hash: 4ad490e6c84a0b7216746dbf592063ce + Hash: 830f59b94aa31bff631c579bbcf0daa8 HashAppended: 0 ClassTypes: - Class: 1 @@ -32,37 +32,39 @@ ClassTypes: - Class: 95 Script: {instanceID: 0} - Class: 114 - Script: {fileID: 860895539, guid: 423c527502fb00e46b2ab34c090b8315, type: 3} + Script: {fileID: 860895539, guid: 8d4647d1c34eabf4994ee44623a0f497, type: 3} - Class: 114 - Script: {fileID: -790547616, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -790547616, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 806682216, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 806682216, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 916105004, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 916105004, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -1164351254, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -1164351254, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -1309757293, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -1309757293, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 78926581, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 78926581, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 534438773, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 534438773, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -120762068, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -120762068, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -2067710655, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -2067710655, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -749020886, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -749020886, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -270813150, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -270813150, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: -1617191155, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: -1617191155, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 677635994, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 677635994, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 2036222940, guid: 27687deae413b90448366870cb0de502, type: 3} + Script: {fileID: 2036222940, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} - Class: 114 - Script: {fileID: 1077175584, guid: 0f1c874d19f16374db66a6621905b435, type: 3} + Script: {fileID: 1077175584, guid: 5140986e5c4050848b00d11439f5888c, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ffc24e0d00092f241ac5a55bdc4fc7a1, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 137 diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs index 7fb416a0..4942cedb 100644 --- a/QSB/Player/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -182,7 +182,7 @@ namespace QSB.Player.TransformSync REMOTE_Player_Body.GetComponent().Init(Player); REMOTE_Player_Body.GetComponent().PlayerName = Player.Name; - Player._ditheringAnimator = REMOTE_Player_Body.AddComponent(); + Player._ditheringAnimator = REMOTE_Player_Body.GetComponent(); // get inactive renderers too Delay.RunNextFrame(() => Player._ditheringAnimator._renderers = Player._ditheringAnimator @@ -196,10 +196,7 @@ namespace QSB.Player.TransformSync */ REMOTE_PlayerCamera.GetComponent().enabled = false; - var owcamera = REMOTE_PlayerCamera.AddComponent(); - owcamera.fieldOfView = 70; - owcamera.nearClipPlane = 0.1f; - owcamera.farClipPlane = 50000f; + var owcamera = REMOTE_PlayerCamera.GetComponent(); Player.Camera = owcamera; Player.CameraBody = REMOTE_PlayerCamera; _visibleCameraRoot = REMOTE_PlayerCamera.transform; diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 5e5c0da8..add79518 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -13,44 +13,37 @@ -:: copy output to unity project -copy /y "$(OutputPath)" "$(UnityAssetsDir)" -:: copy game assembly to unity project -copy /y "$(GameDir)\OuterWilds_Data\Managed\Assembly-CSharp.dll" "$(UnityAssetsDir)" -copy /y "$(GameDir)\OuterWilds_Data\Managed\Assembly-CSharp-firstpass.dll" "$(UnityAssetsDir)" -copy /y "$(GameDir)\OuterWilds_Data\Managed\Unity.InputSystem.dll" "$(UnityAssetsDir)" -copy /y "$(GameDir)\OuterWilds_Data\Managed\EOS-SDK.dll" "$(UnityAssetsDir)" -copy /y "$(GameDir)\OuterWilds_Data\Managed\UniSense.dll" "$(UnityAssetsDir)" - -:: copy owml files to unity project -copy /y "$(OwmlDir)\Autofac.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Newtonsoft.Json.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\0Harmony.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\MonoMod.Utils.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\MonoMod.RuntimeDetour.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Mono.Cecil.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Mono.Cecil.Mdb.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Mono.Cecil.Pdb.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Mono.Cecil.Rocks.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\dnpatch.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\dnlib.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\Gameloop.Vdf.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\NAudio-Unity.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Common.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.Assets.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.Events.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.Menus.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.Input.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModHelper.Interaction.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Utils.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Common.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Logging.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.ModLoader.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Patcher.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.GameFinder.dll" "$(UnityAssetsDir)" -copy /y "$(OwmlDir)\OWML.Abstractions.dll" "$(UnityAssetsDir)" - + copy /y "$(OutputPath)" "$(UnityAssetsDir)" + copy /y "$(GameDir)\OuterWilds_Data\Managed\Assembly-CSharp-firstpass.dll" "$(UnityAssetsDir)" + copy /y "$(GameDir)\OuterWilds_Data\Managed\Unity.InputSystem.dll" "$(UnityAssetsDir)" + copy /y "$(GameDir)\OuterWilds_Data\Managed\UnityEngine.UI.dll" "$(UnityAssetsDir)" + copy /y "$(GameDir)\OuterWilds_Data\Managed\EOS-SDK.dll" "$(UnityAssetsDir)" + copy /y "$(GameDir)\OuterWilds_Data\Managed\UniSense.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Autofac.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Newtonsoft.Json.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\0Harmony.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\MonoMod.Utils.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\MonoMod.RuntimeDetour.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Mono.Cecil.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Mono.Cecil.Mdb.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Mono.Cecil.Pdb.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\Mono.Cecil.Rocks.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Common.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.Assets.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.Events.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.Menus.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.Input.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModHelper.Interaction.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Utils.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Common.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Logging.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.ModLoader.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Patcher.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.GameFinder.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\OWML.Abstractions.dll" "$(UnityAssetsDir)" + copy /y "$(OwmlDir)\NAudio-Unity.dll" "$(UnityAssetsDir)" +