Merge branch 'release/v6.3.0' into develop

Author: HarrisonHough

.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)

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
 

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);
         }
 

Resources/RPM_Template_Avatar.glb renamed to Resources/RPM_Template_Mesh.glb

@@ -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;

Resources/RPM_Template_Avatar.glb.meta renamed to Resources/RPM_Template_Mesh.glb.meta

@@ -103,7 +103,7 @@ private void Initialize()
 
         private void OnStateChanged(StateType current, StateType previous)
         {
-            backButton.gameObject.SetActive(!CanShowBackButton(current));
+            backButton.gameObject.SetActive(CanShowBackButton(current, previous));
             saveButton.gameObject.SetActive(current == StateType.Editor);
 
             if (current == StateType.End)
@@ -112,9 +112,9 @@ private void OnStateChanged(StateType current, StateType previous)
             }
         }
 
-        private bool CanShowBackButton(StateType current)
+        private bool CanShowBackButton(StateType current, StateType previous)
         {
-            return current == StateType.LoginWithCodeFromEmail || current == StateType.AvatarSelection;
+            return current != startingState && current != previous;
         }
 
         public void OnCustomizeDraft(string avatarId)

Resources/RPM_Template_Avatar_XR.glb renamed to Resources/RPM_Template_Mesh_XR.glb

@@ -13,7 +13,7 @@ public abstract class StateMachine : MonoBehaviour
 
         protected Action<StateType, StateType> StateChanged;
         private StateType currentState;
-        
+
         protected void Initialize(List<State> states)
         {
             foreach (var state in states)
@@ -34,7 +34,7 @@ public void SetState(StateType stateType)
                     SetState(stateTypeMap[stateType].NextState);
                     return;
                 }
-                
+
                 previousStates.Push(previousState);
             }
 
@@ -54,23 +54,20 @@ protected void ClearPreviousStates()
         public void GoToPreviousState()
         {
             var previousState = currentState;
-
-            DeactivateState(stateTypeMap[previousState]);
+            if (currentState == StateType.None || previousStates.Count == 0) return;
 
+            DeactivateState(stateTypeMap[previousState]);
             currentState = previousStates.Pop();
-            if (currentState != StateType.None)
-            {
-                ActivateState(stateTypeMap[currentState]);
-                StateChanged?.Invoke(currentState, previousState);
-            }
+            ActivateState(stateTypeMap[currentState]);
+            StateChanged?.Invoke(currentState, previousState);
         }
 
         private void ActivateState(State state)
         {
             state.gameObject.SetActive(true);
             state.ActivateState();
         }
-        
+
         private void DeactivateState(State state)
         {
             state.gameObject.SetActive(false);

Resources/RPM_Template_Avatar_XR.glb.meta renamed to Resources/RPM_Template_Mesh_XR.glb.meta

@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "6.2.4",
+  "version": "6.3.0",
   "displayName": "Ready Player Me Core",
   "description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files \n - Avatar creation \n - Avatar and 2D render requests \n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
   "unity": "2020.3",