chore: merge latest dev updates

readyplayerme · Dec 22, 2023 · f9c70c6 · f9c70c6
2 parents be75f11 + 5a8164c
commit f9c70c6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Updated
 - updated to GLTFast 6.0.1 by @harrisonhough in [#XXX]()
 
+## [4.1.2] - 2023.12.20
+
+### Fixed
+- add preserve attribute to CategoryConverter in AvatarCreator by @harrisonHough in [#193](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/193)
+
+## [4.1.1] - 2023.11.29
+
+### Fixed
+- fixed json converters in AvatarCreator getting stripped on android or webgl builds by @rYuuk in [#188](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/188)
+
 ## [4.1.0] - 2023.11.29
 
 ### Updated

diff --git a/Editor/Core/Scripts/UI/EditorWindows/Templates/SubdomainTemplate.cs b/Editor/Core/Scripts/UI/EditorWindows/Templates/SubdomainTemplate.cs
@@ -68,7 +68,10 @@ private EventCallback<ChangeEvent<string>> SubdomainChanged(VisualElement errorI
                 errorIcon.visible = !IsValidSubdomain();
                 if (changeEvent.previousValue == partnerSubdomain) return;
                 subdomainField.SetValueWithoutNotify(partnerSubdomain);
-                subdomainField.Focus(); // forces text to resize, making new subdomain value visible
+                if (changeEvent.newValue != partnerSubdomain)
+                {
+                    subdomainField.Focus(); // forces text to resize, making new subdomain value visible
+                }
                 OnSubdomainChanged?.Invoke(partnerSubdomain);
             };
         }

diff --git a/Runtime/AvatarCreator/Scripts/JsonConverters/CategoryConverter.cs b/Runtime/AvatarCreator/Scripts/JsonConverters/CategoryConverter.cs
@@ -1,9 +1,11 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using UnityEngine.Scripting;
 
 namespace ReadyPlayerMe.AvatarCreator
 {
+    [Preserve]
     public class CategoryConverter : JsonConverter
     {
         public override bool CanConvert(Type objectType)

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
     {
-        private const string SDK_VERSION = "v4.1.1";
+        private const string SDK_VERSION = "v4.1.2";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "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",