diff --git a/FMODCoreAPI/Assets/x64/fmod.dll b/FMODCoreAPI/Assets/x64/fmod.dll index 5425dd6..cd047aa 100644 --- a/FMODCoreAPI/Assets/x64/fmod.dll +++ b/FMODCoreAPI/Assets/x64/fmod.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba377c62ad807fe17e4177b46259237035e544a5893367e296fbae07b11b1bcb -size 1852928 +oid sha256:74c82920da14ea8a84491d49d6aa80831e1910fefbb5308dc823af21b9587db2 +size 1851904 diff --git a/FMODCoreAPI/fmod.cs b/FMODCoreAPI/fmod.cs index ecb0274..78302c6 100644 --- a/FMODCoreAPI/fmod.cs +++ b/FMODCoreAPI/fmod.cs @@ -19,7 +19,7 @@ */ public partial class VERSION { - public const int number = 0x00020219; + public const int number = 0x00020220; #if !UNITY_2019_4_OR_NEWER public const string dll = "fmod"; #endif @@ -838,6 +838,7 @@ public uint randomSeed; public int maxConvolutionThreads; public int maxOpusCodecs; + public int maxSpatialObjects; } [Flags] diff --git a/FMODCoreAPI/fmod_errors.cs b/FMODCoreAPI/fmod_errors.cs index 63f3140..f86fb95 100644 --- a/FMODCoreAPI/fmod_errors.cs +++ b/FMODCoreAPI/fmod_errors.cs @@ -45,7 +45,7 @@ case FMOD.RESULT.ERR_HTTP_TIMEOUT: return "The HTTP request timed out."; case FMOD.RESULT.ERR_INITIALIZATION: return "FMOD was not initialized correctly to support this function."; case FMOD.RESULT.ERR_INITIALIZED: return "Cannot call this command after System::init."; - case FMOD.RESULT.ERR_INTERNAL: return "An error occurred that wasn't supposed to. Contact support."; + case FMOD.RESULT.ERR_INTERNAL: return "An error occured in the FMOD system. Use the logging version of FMOD for more information."; case FMOD.RESULT.ERR_INVALID_FLOAT: return "Value passed in was a NaN, Inf or denormalized float."; case FMOD.RESULT.ERR_INVALID_HANDLE: return "An invalid object handle was used."; case FMOD.RESULT.ERR_INVALID_PARAM: return "An invalid parameter was passed to this function."; @@ -83,7 +83,7 @@ case FMOD.RESULT.ERR_TAGNOTFOUND: return "The specified tag could not be found or there are no tags."; case FMOD.RESULT.ERR_TOOMANYCHANNELS: return "The sound created exceeds the allowable input channel count. This can be increased using the 'maxinputchannels' parameter in System::setSoftwareFormat."; case FMOD.RESULT.ERR_TRUNCATED: return "The retrieved string is too long to fit in the supplied buffer and has been truncated."; - case FMOD.RESULT.ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be! contact support!"; + case FMOD.RESULT.ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be. Contact support."; case FMOD.RESULT.ERR_UNINITIALIZED: return "This command failed because System::init or System::setDriver was not called."; case FMOD.RESULT.ERR_UNSUPPORTED: return "A command issued was not supported by this object. Possibly a plugin without certain callbacks specified."; case FMOD.RESULT.ERR_VERSION: return "The version number of this file format is not supported."; diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 721ac88..c7f82c3 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs index 526fc03..43d6e1e 100644 --- a/Qwilight/ViewModel/AvatarViewModel.cs +++ b/Qwilight/ViewModel/AvatarViewModel.cs @@ -881,14 +881,14 @@ IsAvatarWwwLevelLoading = false; break; case 4: - HandledLevelName ??= HandledLevelNameCollection.FirstOrDefault(); + HandledLevelName = HandledLevelName ?? HandledLevelNameCollection.FirstOrDefault(); break; case 5 when IsLevelVSVisible: LevelVSMyAvatarWwwValue = new(TwilightSystem.Instance.AvatarID); LevelVSMyAvatarName = TwilightSystem.Instance.AvatarName; LevelVSTargetAvatarWwwValue = new(_avatarID); LevelVSTargetAvatarName = _avatarName; - LevelVSLevelName ??= LevelVSLevelNameCollection.FirstOrDefault(); + LevelVSLevelName = LevelVSLevelName ?? LevelVSLevelNameCollection.FirstOrDefault(); break; } }