Merge branch '4.1-beta' into 4.2-beta

CHANGELOG.md

@@ -66,7 +66,7 @@
 
 ### Unity
 
-* **Officially supported Unity versions are 2017.1-2021.1**.
+* **Officially supported Unity versions are 2017.1-2022.1**.
 
 * **Additions**
   * `SpineAtlasAsset.CreateRuntimeInstance` methods now provide an optional `newCustomTextureLoader` parameter (defaults to `null`) which can be set to e.g. `(a) => new YourCustomTextureLoader(a)` to use your own `TextureLoader` subclass instead of `MaterialsTextureLoader`.
@@ -219,7 +219,7 @@
 
 ### Unity
 
-* **Officially supported Unity versions are 2017.1-2021.1**.
+* **Officially supported Unity versions are 2017.1-2022.1**.
 * **Breaking changes**
   * Removed all `Spine.Unity.AttachmentTools.SkinUtilities` Skin extension methods. These have become obsoleted and error-prone since the introduction of the new Skin API in 3.8. To fix any compile errors, replace any usage of `Skin` extension methods with their counterparts, e.g. replace occurrances of `skin.AddAttachments()` with `skin.AddSkin()`. Please see the example scene `Mix and Match Skins` on how to use the new Skin API to combine skins, or the updated old example scenes `Mix and Match` and `Mix and Match Equip` on how you can update an existing project using the old workflow. If you are using `skeletonAnimation.Skeleton.UnshareSkin()` in your code, you can replace it with `Skin customSkin = new Skin("custom skin"); customSkin.AddSkin(skeletonAnimation.Skeleton.Skin);`.
   * `Skin.GetAttachments()` has been replaced by `Skin.Attachments`, returning an `ICollection<SkinEntry>`. This makes access more consistent and intuitive. To fix any compile errors, replace any occurrances of `Skin.GetAttachments()` by `Skin.Attachments`.

spine-ts/package-lock.json

@@ -53,9 +53,9 @@
       "dev": true
     },
     "node_modules/@types/three": {
-      "version": "0.133.1",
+      "version": "0.140.0",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.133.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.140.0.tgz",
-      "integrity": "sha512-XqBrP/+kbs+o0CYRhCVVE95v7FaL2bO5Z7+3VQJE0nEyjo+9LoLfeNgZITOnndKHxM+7ltEciAIR7uE0SZlsOg=="
+      "integrity": "sha512-YPJLSIY6uKUOp1k6BZYDq5GtEIdhfeK04UCbc9IPAVbdn/RNjkfrbnyd7smrsNkJhc0IFASLpd3AAYgwqgXKVQ=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -7569,9 +7569,9 @@
       }
     },
     "node_modules/three": {
-      "version": "0.133.1",
+      "version": "0.140.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.133.1.tgz",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.140.2.tgz",
-      "integrity": "sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw=="
+      "integrity": "sha512-DdT/AHm/TbZXEhQKQpGt5/iSgBrmXpjU26FNtj1KhllVPTKj1eG4X/ShyD5W2fngE+I1s1wa4ttC4C3oCJt7Ag=="
     },
     "node_modules/through": {
       "version": "2.3.8",
@@ -7992,8 +7992,8 @@
       "license": "LicenseRef-LICENSE",
       "dependencies": {
         "@esotericsoftware/spine-core": "^4.2.2",
-        "@types/three": "^0.133.1",
+        "@types/three": "^0.140.0",
-        "three": "^0.133.1"
+        "three": "^0.140.0"
       }
     },
     "spine-webgl": {
@@ -8025,8 +8025,8 @@
       "version": "file:spine-threejs",
       "requires": {
         "@esotericsoftware/spine-core": "^4.2.2",
-        "@types/three": "^0.133.1",
+        "@types/three": "^0.140.0",
-        "three": "^0.133.1"
+        "three": "^0.140.0"
       }
     },
     "@esotericsoftware/spine-webgl": {
@@ -8042,9 +8042,9 @@
       "dev": true
     },
     "@types/three": {
-      "version": "0.133.1",
+      "version": "0.140.0",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.133.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.140.0.tgz",
-      "integrity": "sha512-XqBrP/+kbs+o0CYRhCVVE95v7FaL2bO5Z7+3VQJE0nEyjo+9LoLfeNgZITOnndKHxM+7ltEciAIR7uE0SZlsOg=="
+      "integrity": "sha512-YPJLSIY6uKUOp1k6BZYDq5GtEIdhfeK04UCbc9IPAVbdn/RNjkfrbnyd7smrsNkJhc0IFASLpd3AAYgwqgXKVQ=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -13963,9 +13963,9 @@
       }
     },
     "three": {
-      "version": "0.133.1",
+      "version": "0.140.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.133.1.tgz",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.140.2.tgz",
-      "integrity": "sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw=="
+      "integrity": "sha512-DdT/AHm/TbZXEhQKQpGt5/iSgBrmXpjU26FNtj1KhllVPTKj1eG4X/ShyD5W2fngE+I1s1wa4ttC4C3oCJt7Ag=="
     },
     "through": {
       "version": "2.3.8",
@@ -14277,4 +14277,4 @@
       "dev": true
     }
   }
-}
+}

spine-ts/spine-threejs/example/index.html

@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>spine-threejs</title>
-	<script src="https://unpkg.com/three@0.138.3/build/three.js"></script>
+	<script src="https://unpkg.com/three@0.141.0/build/three.js"></script>
 	<script src="../dist/iife/spine-threejs.js"></script>
 	<script src="./OrbitalControls.js"></script>
 </head>

spine-ts/spine-threejs/package.json

@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
   "dependencies": {
-    "@types/three": "^0.133.1",
+    "@types/three": "^0.140.0",
-    "three": "^0.133.1",
+    "three": "^0.140.0",
     "@esotericsoftware/spine-core": "^4.2.2"
   }
 }

spine-unity/README.md

@@ -22,7 +22,7 @@ Unity's physics components do not support dynamically assigned vertices so they
 
 ## Unity version
 
-spine-unity is compatible with Unity 2017.1-2021.1.
+spine-unity is compatible with Unity 2017.1-2022.1.
 
 ## Usage