Merge branch 'develop' into feature/fix-e2e-tests

readyplayerme · Jun 12, 2024 · 4baf9c9 · 4baf9c9
2 parents 155a9bd + 50a6adf
commit 4baf9c9
Show file tree

Hide file tree

Showing 18 changed files with 355 additions and 189 deletions.
diff --git a/.github/latest.md b/.github/latest.md
@@ -1,6 +1,18 @@
 
 ## Changelog
 
+### Updated
+
+- XR animation avatars now have DOF enabled by default [#288](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/288)
+- Updated InCreatorAvatarLoader to use avatar config [#286](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/286)
+- Avatar Creator Icon categories updated [#272](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/272)
+
 ### Fixed
 
-- Updated XR template prefab meshes to prevent missing bone references to fix mexh transfer [#266](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/266)
+- Fixed an issue preventing LOD's from updating [#277](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/277)
+- An issue causing multiple signup requests [#275](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/275)
+
+### Added
+- Avatar template type filter [#270](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/270)
+- Handle failed body shape requests [#281](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/281)
+- Option to filter Templates by gender [#273](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/273)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,29 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.3.0] - 2024.06.11
+
+### Updated
+
+- XR animation avatars now have DOF enabled by default [#288](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/288)
+- Updated InCreatorAvatarLoader to use avatar config [#286](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/286)
+- Avatar Creator Icon categories updated [#272](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/272)
+
+### Fixed 
+
+- Fixed an issue preventing LOD's from updating [#277](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/277)
+- An issue causing multiple signup requests [#275](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/275)
+
+### Added
+- Avatar template type filter [#270](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/270)
+- Handle failed body shape requests [#281](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/281)
+- Option to filter Templates by gender [#273](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/273)
+
 ## [6.2.4] - 2024.05.03
 
 ### Fixed
 
-- Updated XR template prefab meshes to prevent missing bone references to fix mexh transfer [#266](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/266)
+- Updated XR template prefab meshes to prevent missing bone references to fix mesh transfer [#266](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/266)
 
 ## [6.2.3] - 2024.04.29
 

diff --git a/Editor/Core/Scripts/UI/EditorWindows/SettingsWindow/SettingsEditor.cs b/Editor/Core/Scripts/UI/EditorWindows/SettingsWindow/SettingsEditor.cs
@@ -105,7 +105,7 @@ private void OnCachingHelpClick()
 
         private void OnAvatarCachingToggle(ChangeEvent<bool> evt)
         {
-            AvatarLoaderSettingsHelper.AvatarLoaderSettings.AvatarCachingEnabled = evt.newValue;
+            AvatarLoaderSettingsHelper.SetAvatarCaching(evt.newValue);
             AnalyticsEditorLogger.EventLogger.LogSetCachingEnabled(evt.newValue);
         }
 

diff --git a/Resources/RPM_Template_Avatar.glb → Resources/RPM_Template_Mesh.glb b/Resources/RPM_Template_Avatar.glb → Resources/RPM_Template_Mesh.glb
diff --git a/Resources/RPM_Template_Avatar.glb.meta → Resources/RPM_Template_Mesh.glb.meta b/Resources/RPM_Template_Avatar.glb.meta → Resources/RPM_Template_Mesh.glb.meta
diff --git a/Resources/RPM_Template_Avatar_XR.glb → Resources/RPM_Template_Mesh_XR.glb b/Resources/RPM_Template_Avatar_XR.glb → Resources/RPM_Template_Mesh_XR.glb
diff --git a/Resources/RPM_Template_Avatar_XR.glb.meta → Resources/RPM_Template_Mesh_XR.glb.meta b/Resources/RPM_Template_Avatar_XR.glb.meta → Resources/RPM_Template_Mesh_XR.glb.meta
diff --git a/Runtime/Core/Resources/AnimationAvatars/Feminine_XR.fbx.meta b/Runtime/Core/Resources/AnimationAvatars/Feminine_XR.fbx.meta
diff --git a/Runtime/Core/Resources/AnimationAvatars/Masculine_XR.fbx.meta b/Runtime/Core/Resources/AnimationAvatars/Masculine_XR.fbx.meta
diff --git a/Runtime/Core/Scripts/Data/ApplicationData.cs b/Runtime/Core/Scripts/Data/ApplicationData.cs
@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        public const string SDK_VERSION = "v6.2.4";
+        public const string SDK_VERSION = "v6.3.0";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;