From 29ffc37d422dd3a6fe5293664bd6da0bdbb0814e Mon Sep 17 00:00:00 2001 From: Happyrobot33 Date: Tue, 16 Apr 2024 21:15:11 -0400 Subject: [PATCH] Add in missing changes to docs --- Packages/com.mattshark.openflight/Editor/UI Styler.meta | 8 -------- .../Runtime/Scripts/Detection/AvatarDetection.cs | 9 ++++++--- Packages/packages-lock.json | 6 ++++++ ProjectSettings/AudioManager.asset | 4 ++-- ProjectSettings/GraphicsSettings.asset | 6 +----- ProjectSettings/QualitySettings.asset | 2 +- 6 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 Packages/com.mattshark.openflight/Editor/UI Styler.meta diff --git a/Packages/com.mattshark.openflight/Editor/UI Styler.meta b/Packages/com.mattshark.openflight/Editor/UI Styler.meta deleted file mode 100644 index 9a3ed1ce..00000000 --- a/Packages/com.mattshark.openflight/Editor/UI Styler.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 57e2614f0a5bab64c85e0eca9fe837e5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.mattshark.openflight/Runtime/Scripts/Detection/AvatarDetection.cs b/Packages/com.mattshark.openflight/Runtime/Scripts/Detection/AvatarDetection.cs index e91fe0ca..501dbe13 100644 --- a/Packages/com.mattshark.openflight/Runtime/Scripts/Detection/AvatarDetection.cs +++ b/Packages/com.mattshark.openflight/Runtime/Scripts/Detection/AvatarDetection.cs @@ -113,21 +113,24 @@ public class AvatarDetection : CallbackUdonSharpBehaviour public float WingtipOffset = 0; #pragma warning disable CS0108 // Member hides inherited member; missing new keyword /// - /// The name of the currently worn avatar. Defaults to `Unknown` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig + /// The name of the currently worn avatar. Defaults to `N/A` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig /// [ReadOnlyInspector] public string name = ""; //this is the name of the avatar base #pragma warning restore CS0108 // Member hides inherited member; missing new keyword /// - /// The creator of the currently worn avatar. Defaults to `Unknown` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig + /// The creator of the currently worn avatar. Defaults to `N/A` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig /// [ReadOnlyInspector] public string creator = ""; //this is the person who created the avatar base /// - /// The introducer of the currently worn avatar. Defaults to `Unknown` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig + /// The introducer of the currently worn avatar. Defaults to `N/A` if not in the list, or `Loading Avatar` if you are in the loading avatar / mecanim default rig /// [ReadOnlyInspector] public string introducer = ""; //this is the person who introduced the avatar to the JSON list itself + /// + /// The hash of the default mecanim humanoid rig, which is also what VRChat uses as the loading avatar + /// const string LOADINGAVATARHASH = "1439458325v2"; #endregion diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e33b0cd4..e7b3057a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,11 @@ { "dependencies": { + "com.cyan.playerobjectpool": { + "version": "file:com.cyan.playerobjectpool", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, "com.mattshark.openflight": { "version": "file:com.mattshark.openflight", "depth": 0, diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index d9250210..ba6209ee 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 32 - m_RealVoiceCount: 24 + m_VirtualVoiceCount: 64 + m_RealVoiceCount: 32 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b4d1541b..31faccb7 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -28,11 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: [] m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 217010f3..0c8e050c 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 2 name: VRC Low