Răsfoiți Sursa

Merge branch '3.8' into 3.9-beta

badlogic 6 ani în urmă
părinte
comite
9040824e2b
100 a modificat fișierele cu 3995 adăugiri și 4975 ștergeri
  1. BIN
      examples/alien/alien-ess.spine
  2. BIN
      examples/alien/alien-pro.spine
  3. 20 20
      examples/alien/export/alien-ess.json
  4. BIN
      examples/alien/export/alien-ess.skel
  5. 4 4
      examples/alien/export/alien-pro.json
  6. BIN
      examples/alien/export/alien-pro.skel
  7. BIN
      examples/coin/coin-pro.spine
  8. 20 20
      examples/coin/export/coin-pro.json
  9. BIN
      examples/coin/export/coin-pro.skel
  10. BIN
      examples/dragon/dragon-ess.spine
  11. 1 1
      examples/dragon/export/dragon-ess.json
  12. BIN
      examples/dragon/export/dragon-ess.skel
  13. 0 3
      examples/export/export.sh
  14. 0 14
      examples/export/runtimes.sh
  15. 1 1
      examples/goblins/export/goblins-ess.json
  16. BIN
      examples/goblins/export/goblins-ess.skel
  17. 90 90
      examples/goblins/export/goblins-pro.json
  18. BIN
      examples/goblins/export/goblins-pro.skel
  19. BIN
      examples/goblins/goblins-ess.spine
  20. BIN
      examples/goblins/goblins-pro.spine
  21. 1 1
      examples/hero/export/hero-ess.json
  22. BIN
      examples/hero/export/hero-ess.skel
  23. 3 3
      examples/hero/export/hero-pro.json
  24. BIN
      examples/hero/export/hero-pro.skel
  25. BIN
      examples/hero/hero-ess.spine
  26. BIN
      examples/hero/hero-pro.spine
  27. 161 163
      examples/mix-and-match/export/mix-and-match-pro.json
  28. BIN
      examples/mix-and-match/export/mix-and-match-pro.skel
  29. 1 1
      examples/mix-and-match/license.txt
  30. BIN
      examples/mix-and-match/mix-and-match-pro.spine
  31. 7 7
      examples/owl/export/owl-pro.json
  32. BIN
      examples/owl/export/owl-pro.skel
  33. BIN
      examples/owl/owl-pro.spine
  34. 33 33
      examples/powerup/export/powerup-ess.json
  35. BIN
      examples/powerup/export/powerup-ess.skel
  36. 4 5
      examples/powerup/export/powerup-pro.json
  37. BIN
      examples/powerup/export/powerup-pro.skel
  38. BIN
      examples/powerup/powerup-ess.spine
  39. BIN
      examples/powerup/powerup-pro.spine
  40. 33 61
      examples/raptor/export/raptor-pro.json
  41. BIN
      examples/raptor/export/raptor-pro.skel
  42. BIN
      examples/raptor/raptor-pro.spine
  43. 11 11
      examples/speedy/export/speedy-ess.json
  44. BIN
      examples/speedy/export/speedy-ess.skel
  45. BIN
      examples/speedy/speedy-ess.spine
  46. 17 17
      examples/spineboy/export/spineboy-ess.json
  47. BIN
      examples/spineboy/export/spineboy-ess.skel
  48. 20 159
      examples/spineboy/export/spineboy-pro.json
  49. BIN
      examples/spineboy/export/spineboy-pro.skel
  50. BIN
      examples/spineboy/spineboy-ess.spine
  51. BIN
      examples/spineboy/spineboy-pro.spine
  52. 14 14
      examples/spinosaurus/export/spinosaurus-ess.json
  53. BIN
      examples/spinosaurus/export/spinosaurus-ess.skel
  54. BIN
      examples/spinosaurus/spinosaurus-ess.spine
  55. 171 106
      examples/stretchyman/export/stretchyman-pro.json
  56. BIN
      examples/stretchyman/export/stretchyman-pro.skel
  57. 0 511
      examples/stretchyman/export/stretchyman-stretchy-ik-pro.json
  58. BIN
      examples/stretchyman/export/stretchyman-stretchy-ik-pro.skel
  59. 0 12
      examples/stretchyman/images/rename.bat
  60. BIN
      examples/stretchyman/stretchyman-pro.spine
  61. BIN
      examples/stretchyman/stretchyman-stretchy-ik-pro.spine
  62. 382 408
      examples/tank/export/tank-pro.json
  63. BIN
      examples/tank/export/tank-pro.skel
  64. BIN
      examples/tank/tank-pro.spine
  65. 3 3
      examples/vine/export/vine-pro.json
  66. BIN
      examples/vine/export/vine-pro.skel
  67. BIN
      examples/vine/vine-pro.spine
  68. 80 80
      examples/windmill/export/windmill-ess.json
  69. BIN
      examples/windmill/export/windmill-ess.skel
  70. BIN
      examples/windmill/windmill-ess.spine
  71. 60 60
      spine-as3/spine-as3-example/src/spineboy-ess.json
  72. 24 24
      spine-cocos2d-objc/Resources/coin-pro.json
  73. 306 306
      spine-cocos2d-objc/Resources/goblins-pro.json
  74. 62 87
      spine-cocos2d-objc/Resources/raptor-pro.json
  75. 60 60
      spine-cocos2d-objc/Resources/spineboy-ess.json
  76. 439 220
      spine-cocos2d-objc/Resources/tank-pro.json
  77. BIN
      spine-cocos2dx/example/Resources/common/coin-pro.skel
  78. 306 306
      spine-cocos2dx/example/Resources/common/goblins-pro.json
  79. BIN
      spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel
  80. 62 87
      spine-cocos2dx/example/Resources/common/raptor-pro.json
  81. 7 77
      spine-cocos2dx/example/Resources/common/spineboy-pro.json
  82. BIN
      spine-cocos2dx/example/Resources/common/tank-pro.skel
  83. 24 24
      spine-corona/data/coin-pro.json
  84. 306 306
      spine-corona/data/goblins-pro.json
  85. 129 135
      spine-corona/data/mix-and-match-pro.json
  86. 41 64
      spine-corona/data/owl-pro.json
  87. 62 87
      spine-corona/data/raptor-pro.json
  88. 7 77
      spine-corona/data/spineboy-pro.json
  89. 34 26
      spine-corona/data/stretchyman-pro.json
  90. 0 512
      spine-corona/data/stretchyman-stretchy-ik-pro.json
  91. 439 220
      spine-corona/data/tank-pro.json
  92. 11 3
      spine-corona/data/vine-pro.json
  93. 1 2
      spine-corona/main.lua
  94. 24 24
      spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json
  95. BIN
      spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel
  96. 79 79
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json
  97. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel
  98. 306 306
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json
  99. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel
  100. 129 135
      spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json

BIN
examples/alien/alien-ess.spine


BIN
examples/alien/alien-pro.spine


+ 20 - 20
examples/alien/export/alien-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "5wFWXjLvxi+GryXQDbei5GgP7rU",
-	"spine": "3.8.44-beta",
+	"hash": "GI5HIy7VXSyAemjLiD8DnxDgI+E",
+	"spine": "3.8.55",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 365.79,
@@ -238,6 +238,11 @@
 "animations": {
 	"death": {
 		"slots": {
+			"eye": {
+				"attachment": [
+					{ "time": 1.3667, "name": null }
+				]
+			},
 			"head": {
 				"attachment": [
 					{ "time": 0.2333, "name": "burst01" },
@@ -245,17 +250,9 @@
 					{ "time": 1.3667, "name": null }
 				]
 			},
-			"splat01": {
-				"color": [
-					{ "time": 1.5667, "color": "ffffffff" },
-					{ "time": 1.7333, "color": "ffffffba", "curve": 0.498, "c3": 0.753, "c4": 0.37 },
-					{ "time": 1.8667, "color": "ffffff00" }
-				],
+			"eye-pupil": {
 				"attachment": [
-					{ "time": 1.3667, "name": "splat01" },
-					{ "time": 1.5667, "name": "splat02" },
-					{ "time": 1.7333, "name": "splat03" },
-					{ "time": 1.8667, "name": null }
+					{ "time": 1.3667, "name": null }
 				]
 			},
 			"blown-up-neck": {
@@ -263,19 +260,22 @@
 					{ "time": 1.3667, "name": "blown-up-neck" }
 				]
 			},
-			"eye-pupil": {
-				"attachment": [
-					{ "time": 1.3667, "name": null }
-				]
-			},
-			"eye": {
+			"eye-highlight": {
 				"attachment": [
 					{ "time": 1.3667, "name": null }
 				]
 			},
-			"eye-highlight": {
+			"splat01": {
+				"color": [
+					{ "time": 1.5667, "color": "ffffffff" },
+					{ "time": 1.7333, "color": "ffffffba", "curve": 0.498, "c3": 0.753, "c4": 0.37 },
+					{ "time": 1.8667, "color": "ffffff00" }
+				],
 				"attachment": [
-					{ "time": 1.3667, "name": null }
+					{ "time": 1.3667, "name": "splat01" },
+					{ "time": 1.5667, "name": "splat02" },
+					{ "time": 1.7333, "name": "splat03" },
+					{ "time": 1.8667, "name": null }
 				]
 			}
 		},

BIN
examples/alien/export/alien-ess.skel


Fișier diff suprimat deoarece este prea mare
+ 4 - 4
examples/alien/export/alien-pro.json


BIN
examples/alien/export/alien-pro.skel


BIN
examples/coin/coin-pro.spine


+ 20 - 20
examples/coin/export/coin-pro.json

@@ -1,13 +1,13 @@
 {
 "skeleton": {
-	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.44-beta",
+	"hash": "Dq1Q0p2Nq9WJ9gmLxp3FURbKp7Y",
+	"spine": "3.8.55",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,
 	"height": 302,
 	"images": "./images/",
-	"audio": "C:/Program Files (x86)/Spine/examples/coin-new"
+	"audio": ""
 },
 "bones": [
 	{ "name": "root" },
@@ -62,23 +62,6 @@
 "animations": {
 	"animation": {
 		"slots": {
-			"coin-front-shine": {
-				"twoColor": [
-					{ "light": "7d7d7dff", "dark": "000000" },
-					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
-					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
-					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
-					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
-				],
-				"attachment": [
-					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
-					{ "time": 2, "name": "coin-front-shine-logo" }
-				]
-			},
 			"coin-front-texture": {
 				"color": [
 					{ "color": "858585ff" },
@@ -97,6 +80,23 @@
 					{ "time": 0.6667, "name": "coin-front-spineboy" },
 					{ "time": 2, "name": "coin-front-logo" }
 				]
+			},
+			"coin-front-shine": {
+				"twoColor": [
+					{ "light": "7d7d7dff", "dark": "000000" },
+					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
+					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
+					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
+					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
+				],
+				"attachment": [
+					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
+					{ "time": 2, "name": "coin-front-shine-logo" }
+				]
 			}
 		},
 		"bones": {

BIN
examples/coin/export/coin-pro.skel


BIN
examples/dragon/dragon-ess.spine


+ 1 - 1
examples/dragon/export/dragon-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "NNOWRquatThcn5jOLyqLMfcxT60",
-	"spine": "3.8.44-beta",
+	"spine": "3.8.55",
 	"x": -366.31,
 	"y": -286.62,
 	"width": 660.39,

BIN
examples/dragon/export/dragon-ess.skel


+ 0 - 3
examples/export/export.sh

@@ -108,9 +108,6 @@ echo "Exporting..."
 -i ../stretchyman/images -o ../stretchyman/export -n stretchyman -p atlas-1.0.json \
 -i ../stretchyman/images -o ../stretchyman/export -n stretchyman-pma -p atlas-1.0-pma.json \
 \
--i ../stretchyman/stretchyman-stretchy-ik-pro.spine -o ../stretchyman/export -e json.json \
--i ../stretchyman/stretchyman-stretchy-ik-pro.spine -o ../stretchyman/export -e binary.json \
-\
 -i ../tank/tank-pro.spine -o ../tank/export -e json.json \
 -i ../tank/tank-pro.spine -o ../tank/export -e binary.json \
 -i ../tank/images -o ../tank/export -n tank -p atlas-0.5.json \

+ 0 - 14
examples/export/runtimes.sh

@@ -129,8 +129,6 @@ cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-corona/data"
 cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-corona/data"
 cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-corona/data"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.json "$ROOT/spine-corona/data"
-
 cp -f ../owl/export/owl-pro.json "$ROOT/spine-corona/data"
 cp -f ../owl/export/owl.atlas "$ROOT/spine-corona/data"
 cp -f ../owl/export/owl.png "$ROOT/spine-corona/data"
@@ -169,8 +167,6 @@ cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-love/data"
 cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-love/data"
 cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-love/data"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.json "$ROOT/spine-love/data"
-
 cp -f ../mix-and-match/export/mix-and-match-pro.json "$ROOT/spine-love/data"
 cp -f ../mix-and-match/export/mix-and-match.atlas "$ROOT/spine-love/data"
 cp -f ../mix-and-match/export/mix-and-match.png "$ROOT/spine-love/data"
@@ -212,9 +208,6 @@ cp -f ../stretchyman/export/stretchyman-pro.skel "$ROOT/spine-sfml/c/data/"
 cp -f ../stretchyman/export/stretchyman-pma.atlas "$ROOT/spine-sfml/c/data/"
 cp -f ../stretchyman/export/stretchyman-pma.png "$ROOT/spine-sfml/c/data/"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.json "$ROOT/spine-sfml/c/data"
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.skel "$ROOT/spine-sfml/c/data"
-
 cp -f ../owl/export/owl-pro.json "$ROOT/spine-sfml/c/data/"
 cp -f ../owl/export/owl-pro.skel "$ROOT/spine-sfml/c/data/"
 cp -f ../owl/export/owl-pma.atlas "$ROOT/spine-sfml/c/data/"
@@ -262,9 +255,6 @@ cp -f ../stretchyman/export/stretchyman-pro.skel "$ROOT/spine-sfml/cpp/data/"
 cp -f ../stretchyman/export/stretchyman-pma.atlas "$ROOT/spine-sfml/cpp/data/"
 cp -f ../stretchyman/export/stretchyman-pma.png "$ROOT/spine-sfml/cpp/data/"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.json "$ROOT/spine-sfml/cpp/data"
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.skel "$ROOT/spine-sfml/cpp/data"
-
 cp -f ../owl/export/owl-pro.json "$ROOT/spine-sfml/cpp/data/"
 cp -f ../owl/export/owl-pro.skel "$ROOT/spine-sfml/cpp/data/"
 cp -f ../owl/export/owl-pma.atlas "$ROOT/spine-sfml/cpp/data/"
@@ -306,8 +296,6 @@ cp -f ../stretchyman/export/stretchyman-pro.json "$ROOT/spine-starling/spine-sta
 cp -f ../stretchyman/export/stretchyman.atlas "$ROOT/spine-starling/spine-starling-example/src/"
 cp -f ../stretchyman/export/stretchyman.png "$ROOT/spine-starling/spine-starling-example/src/"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
-
 cp -f ../owl/export/owl-pro.json "$ROOT/spine-starling/spine-starling-example/src/"
 cp -f ../owl/export/owl.atlas "$ROOT/spine-starling/spine-starling-example/src/"
 cp -f ../owl/export/owl.png "$ROOT/spine-starling/spine-starling-example/src/"
@@ -352,8 +340,6 @@ cp -f ../stretchyman/export/stretchyman-pro.skel "$ROOT/spine-ts/webgl/example/a
 cp -f ../stretchyman/export/stretchyman-pma.atlas "$ROOT/spine-ts/webgl/example/assets/"
 cp -f ../stretchyman/export/stretchyman-pma.png "$ROOT/spine-ts/webgl/example/assets/"
 
-cp -f ../stretchyman/export/stretchyman-stretchy-ik-pro.skel "$ROOT/spine-ts/webgl/example/assets/"
-
 cp -f ../mix-and-match/export/mix-and-match-pro.skel "$ROOT/spine-ts/webgl/example/assets/"
 cp -f ../mix-and-match/export/mix-and-match-pma.atlas "$ROOT/spine-ts/webgl/example/assets/"
 cp -f ../mix-and-match/export/mix-and-match-pma.png "$ROOT/spine-ts/webgl/example/assets/"

+ 1 - 1
examples/goblins/export/goblins-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "FH/RmN73bEwPPZfiWwT2Fju/FHk",
-	"spine": "3.8.44-beta",
+	"spine": "3.8.55",
 	"x": -92.53,
 	"y": -5.3,
 	"width": 234.03,

BIN
examples/goblins/export/goblins-ess.skel


+ 90 - 90
examples/goblins/export/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "a45E6m4DLUYlDA6oYXyq1lLojb8",
-	"spine": "3.8.44-beta",
+	"hash": "1UfyPXuBeBo953f8bvof4WHo5GA",
+	"spine": "3.8.55",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -222,7 +222,7 @@
 				"spear": {
 					"type": "mesh",
 					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
+					"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
 					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 					"hull": 14,
 					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
@@ -828,6 +828,41 @@
 				}
 			},
 			"goblin": {
+				"undies": {
+					"undies": [
+						{
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						},
+						{
+							"time": 0.1333,
+							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
+						},
+						{
+							"time": 0.5333,
+							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
+						},
+						{
+							"time": 0.8333,
+							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+						},
+						{
+							"time": 0.8667,
+							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+						},
+						{
+							"time": 1,
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						}
+					]
+				},
 				"head": {
 					"head": [
 						{ "curve": 0.633, "c3": 0.75 },
@@ -858,42 +893,6 @@
 						{ "time": 1 }
 					]
 				},
-				"left-foot": {
-					"left-foot": [
-						{
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						},
-						{ "time": 0.1333 },
-						{
-							"time": 0.2333,
-							"offset": 8,
-							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
-						},
-						{
-							"time": 0.3667,
-							"offset": 8,
-							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
-						},
-						{ "time": 0.5, "curve": "stepped" },
-						{ "time": 0.6333 },
-						{
-							"time": 0.7333,
-							"offset": 8,
-							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
-						},
-						{
-							"time": 0.8333,
-							"offset": 6,
-							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
-						},
-						{
-							"time": 1,
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						}
-					]
-				},
 				"right-hand": {
 					"right-hand": [
 						{
@@ -950,23 +949,6 @@
 						{ "time": 0.8667 }
 					]
 				},
-				"right-upper-leg": {
-					"right-upper-leg": [
-						{
-							"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
-						},
-						{ "time": 0.3333 },
-						{
-							"time": 0.8667,
-							"offset": 14,
-							"vertices": [ 0.13425, -2.35378, -1.33318, -5.99573, -1.35862, -4.43324 ]
-						},
-						{
-							"time": 1,
-							"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
-						}
-					]
-				},
 				"torso": {
 					"torso": [
 						{
@@ -1016,36 +998,56 @@
 						{ "time": 1 }
 					]
 				},
-				"undie-straps": {
-					"undie-straps": [
+				"right-upper-leg": {
+					"right-upper-leg": [
 						{
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
+							"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
 						},
+						{ "time": 0.3333 },
 						{
-							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
+							"time": 0.8667,
+							"offset": 14,
+							"vertices": [ 0.13425, -2.35378, -1.33318, -5.99573, -1.35862, -4.43324 ]
 						},
 						{
-							"time": 0.3333,
-							"offset": 2,
-							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
+							"time": 1,
+							"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
+						}
+					]
+				},
+				"left-foot": {
+					"left-foot": [
+						{
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
+						{ "time": 0.1333 },
 						{
-							"time": 0.7,
-							"offset": 2,
-							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
+							"time": 0.2333,
+							"offset": 8,
+							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
-							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
+							"time": 0.3667,
+							"offset": 8,
+							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
+						},
+						{ "time": 0.5, "curve": "stepped" },
+						{ "time": 0.6333 },
+						{
+							"time": 0.7333,
+							"offset": 8,
+							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
+						},
+						{
+							"time": 0.8333,
+							"offset": 6,
+							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
 						},
 						{
 							"time": 1,
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
@@ -1075,38 +1077,36 @@
 						{ "time": 1 }
 					]
 				},
-				"undies": {
-					"undies": [
+				"undie-straps": {
+					"undie-straps": [
 						{
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+							"offset": 2,
+							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
-						},
-						{
-							"time": 0.5333,
-							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+							"offset": 2,
+							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
-						},
-						{
-							"time": 0.8333,
-							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+							"offset": 2,
+							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 0.8667,
-							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+							"offset": 2,
+							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
 						}
 					]
 				}

BIN
examples/goblins/export/goblins-pro.skel


BIN
examples/goblins/goblins-ess.spine


BIN
examples/goblins/goblins-pro.spine


+ 1 - 1
examples/hero/export/hero-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "GKlLtUkXkXrplEF0opVpUHvO7E4",
-	"spine": "3.8.44-beta",
+	"spine": "3.8.55",
 	"x": -87.83,
 	"y": -0.03,
 	"width": 319.3,

BIN
examples/hero/export/hero-ess.skel


Fișier diff suprimat deoarece este prea mare
+ 3 - 3
examples/hero/export/hero-pro.json


BIN
examples/hero/export/hero-pro.skel


BIN
examples/hero/hero-ess.spine


BIN
examples/hero/hero-pro.spine


Fișier diff suprimat deoarece este prea mare
+ 161 - 163
examples/mix-and-match/export/mix-and-match-pro.json


BIN
examples/mix-and-match/export/mix-and-match-pro.skel


+ 1 - 1
examples/mix-and-match/license.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018, Esoteric Software
+Copyright (c) 2019, Esoteric Software
 
 The images in this project may be redistributed as long as they are accompanied
 by this license file. The images may not be used for commercial use of any

BIN
examples/mix-and-match/mix-and-match-pro.spine


Fișier diff suprimat deoarece este prea mare
+ 7 - 7
examples/owl/export/owl-pro.json


BIN
examples/owl/export/owl-pro.skel


BIN
examples/owl/owl-pro.spine


+ 33 - 33
examples/powerup/export/powerup-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "0cJkmOrJJLOeTqTP0KyU6PgkF1o",
-	"spine": "3.8.44-beta",
+	"hash": "nu+SvEKMRXtBh1Vsb6I5rYBBcDU",
+	"spine": "3.8.55",
 	"x": -207.3,
 	"y": 119.41,
 	"width": 413.19,
@@ -92,11 +92,18 @@
 "animations": {
 	"bounce": {
 		"slots": {
-			"star4": {
+			"star7": {
 				"color": [
-					{ "time": 0.6333, "color": "ffffff00" },
-					{ "time": 1.2, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
+					{ "time": 0.6667, "color": "ffffff00" },
+					{ "time": 1.2333, "color": "ffffffff" },
+					{ "time": 1.3667, "color": "ffffff00" }
+				]
+			},
+			"star": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.5667, "color": "ffffffff" },
+					{ "time": 0.7, "color": "ffffff00" }
 				]
 			},
 			"star2": {
@@ -106,13 +113,13 @@
 					{ "time": 0.8333, "color": "ffffff00" }
 				]
 			},
-			"star5": {
+			"star6": {
 				"color": [
-					{ "color": "ffffff9e" },
-					{ "time": 0.2333, "color": "ffffffff" },
-					{ "time": 0.3667, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.0667, "color": "ffffff00" },
-					{ "time": 1.4, "color": "ffffff9e" }
+					{ "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.2667, "color": "ffffffff" },
+					{ "time": 0.4333, "color": "ffffff00", "curve": "stepped" },
+					{ "time": 1.3, "color": "ffffff00" },
+					{ "time": 1.4, "color": "ffffffff" }
 				]
 			},
 			"star9": {
@@ -123,27 +130,27 @@
 					{ "time": 1.4, "color": "ffffffff" }
 				]
 			},
-			"star3": {
+			"star5": {
 				"color": [
-					{ "time": 0.4333, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.1333, "color": "ffffff00" }
+					{ "color": "ffffff9e" },
+					{ "time": 0.2333, "color": "ffffffff" },
+					{ "time": 0.3667, "color": "ffffff00", "curve": "stepped" },
+					{ "time": 1.0667, "color": "ffffff00" },
+					{ "time": 1.4, "color": "ffffff9e" }
 				]
 			},
-			"star": {
+			"star4": {
 				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.5667, "color": "ffffffff" },
-					{ "time": 0.7, "color": "ffffff00" }
+					{ "time": 0.6333, "color": "ffffff00" },
+					{ "time": 1.2, "color": "ffffffff" },
+					{ "time": 1.3333, "color": "ffffff00" }
 				]
 			},
-			"star6": {
+			"star3": {
 				"color": [
-					{ "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.2667, "color": "ffffffff" },
-					{ "time": 0.4333, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.3, "color": "ffffff00" },
-					{ "time": 1.4, "color": "ffffffff" }
+					{ "time": 0.4333, "color": "ffffff00" },
+					{ "time": 1, "color": "ffffffff" },
+					{ "time": 1.1333, "color": "ffffff00" }
 				]
 			},
 			"star1": {
@@ -161,13 +168,6 @@
 					{ "time": 0.9667, "color": "ffffff00" },
 					{ "time": 1.4, "color": "ffffffbe" }
 				]
-			},
-			"star7": {
-				"color": [
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1.2333, "color": "ffffffff" },
-					{ "time": 1.3667, "color": "ffffff00" }
-				]
 			}
 		},
 		"bones": {

BIN
examples/powerup/export/powerup-ess.skel


Fișier diff suprimat deoarece este prea mare
+ 4 - 5
examples/powerup/export/powerup-pro.json


BIN
examples/powerup/export/powerup-pro.skel


BIN
examples/powerup/powerup-ess.spine


BIN
examples/powerup/powerup-pro.spine


Fișier diff suprimat deoarece este prea mare
+ 33 - 61
examples/raptor/export/raptor-pro.json


BIN
examples/raptor/export/raptor-pro.skel


BIN
examples/raptor/raptor-pro.spine


+ 11 - 11
examples/speedy/export/speedy-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "E3PAF6YBVsi9Z1sx6PPvmTFTEqQ",
-	"spine": "3.8.44-beta",
+	"hash": "ta3kc25Djpzf9HaoV3V1qYL4H+k",
+	"spine": "3.8.55",
 	"x": -95.43,
 	"y": -18.79,
 	"width": 196.03,
@@ -125,15 +125,6 @@
 "animations": {
 	"run": {
 		"slots": {
-			"right foot": {
-				"attachment": [
-					{ "name": "right-foot-side" },
-					{ "time": 0.1667, "name": "right-foot-bent01" },
-					{ "time": 0.2333, "name": "right-foot-bent02" },
-					{ "time": 0.3, "name": "right-foot-bent01" },
-					{ "time": 0.4333, "name": "right-foot-side" }
-				]
-			},
 			"hood end1": {
 				"attachment": [
 					{ "name": "hood-end1b" },
@@ -155,6 +146,15 @@
 					{ "time": 0.8667, "name": "hood-end1b" }
 				]
 			},
+			"right foot": {
+				"attachment": [
+					{ "name": "right-foot-side" },
+					{ "time": 0.1667, "name": "right-foot-bent01" },
+					{ "time": 0.2333, "name": "right-foot-bent02" },
+					{ "time": 0.3, "name": "right-foot-bent01" },
+					{ "time": 0.4333, "name": "right-foot-side" }
+				]
+			},
 			"hood end2": {
 				"attachment": [
 					{ "name": "hood-end2b" },

BIN
examples/speedy/export/speedy-ess.skel


BIN
examples/speedy/speedy-ess.spine


+ 17 - 17
examples/spineboy/export/spineboy-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "XIf0WIqvG88R2IljysIpGbv6Odo",
-	"spine": "3.8.44-beta",
+	"hash": "MOhkPvw8nLOrjuLm/U98aFMannI",
+	"spine": "3.8.55",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,
@@ -279,11 +279,6 @@
 "animations": {
 	"death": {
 		"slots": {
-			"front-fist": {
-				"attachment": [
-					{ "name": "front-fist-open" }
-				]
-			},
 			"mouth": {
 				"attachment": [
 					{ "name": "mouth-oooo" },
@@ -291,6 +286,11 @@
 					{ "time": 4.5333, "name": "mouth-oooo" }
 				]
 			},
+			"front-fist": {
+				"attachment": [
+					{ "name": "front-fist-open" }
+				]
+			},
 			"eye": {
 				"attachment": [
 					{ "name": "eye-surprised" },
@@ -483,16 +483,16 @@
 	},
 	"hit": {
 		"slots": {
-			"front-fist": {
-				"attachment": [
-					{ "time": 0.1667, "name": "front-fist-open" }
-				]
-			},
 			"mouth": {
 				"attachment": [
 					{ "name": "mouth-grind" },
 					{ "time": 0.3333, "name": "mouth-smile" }
 				]
+			},
+			"front-fist": {
+				"attachment": [
+					{ "time": 0.1667, "name": "front-fist-open" }
+				]
 			}
 		},
 		"bones": {
@@ -767,17 +767,17 @@
 	},
 	"jump": {
 		"slots": {
+			"mouth": {
+				"attachment": [
+					{ "name": "mouth-grind" }
+				]
+			},
 			"front-fist": {
 				"attachment": [
 					{ "name": "front-fist-open" },
 					{ "time": 0.2, "name": "front-fist-closed" },
 					{ "time": 0.6667, "name": "front-fist-open" }
 				]
-			},
-			"mouth": {
-				"attachment": [
-					{ "name": "mouth-grind" }
-				]
 			}
 		},
 		"bones": {

BIN
examples/spineboy/export/spineboy-ess.skel


Fișier diff suprimat deoarece este prea mare
+ 20 - 159
examples/spineboy/export/spineboy-pro.json


BIN
examples/spineboy/export/spineboy-pro.skel


BIN
examples/spineboy/spineboy-ess.spine


BIN
examples/spineboy/spineboy-pro.spine


+ 14 - 14
examples/spinosaurus/export/spinosaurus-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "/oBn/39C9DiEo+0+HkQuS2jebw8",
-	"spine": "3.8.44-beta",
+	"hash": "Fm7ZAFF1Cq7l7KrYgoAPA18D/rI",
+	"spine": "3.8.55",
 	"x": -840,
 	"y": -766.03,
 	"width": 1680,
@@ -50,12 +50,12 @@
 "animations": {
 	"animation": {
 		"slots": {
-			"play": {
+			"settings": {
 				"color": [
-					{ "time": 1.3333, "color": "fff99dff" },
-					{ "time": 1.5667, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 1.8333, "color": "ffffffff" },
-					{ "time": 2.0667, "color": "fff99dff" }
+					{ "time": 1.8667, "color": "fff99dff" },
+					{ "time": 2.1, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 2.3667, "color": "ffffffff" },
+					{ "time": 2.6, "color": "fff99dff" }
 				]
 			},
 			"quit": {
@@ -64,24 +64,24 @@
 					{ "time": 2.6333, "color": "ffffffff" }
 				]
 			},
-			"leaves": {
+			"logo": {
 				"color": [
 					{ "color": "ffffff00" },
 					{ "time": 0.3333, "color": "ffffffff" }
 				]
 			},
-			"logo": {
+			"leaves": {
 				"color": [
 					{ "color": "ffffff00" },
 					{ "time": 0.3333, "color": "ffffffff" }
 				]
 			},
-			"settings": {
+			"play": {
 				"color": [
-					{ "time": 1.8667, "color": "fff99dff" },
-					{ "time": 2.1, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 2.3667, "color": "ffffffff" },
-					{ "time": 2.6, "color": "fff99dff" }
+					{ "time": 1.3333, "color": "fff99dff" },
+					{ "time": 1.5667, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 1.8333, "color": "ffffffff" },
+					{ "time": 2.0667, "color": "fff99dff" }
 				]
 			}
 		},

BIN
examples/spinosaurus/export/spinosaurus-ess.skel


BIN
examples/spinosaurus/spinosaurus-ess.spine


+ 171 - 106
examples/stretchyman/export/stretchyman-pro.json

@@ -1,10 +1,10 @@
 {
 "skeleton": {
-	"hash": "w2AlBS/cEofcjDTmkMfk8NwI3Gg",
-	"spine": "3.8.44-beta",
-	"x": -104.34,
+	"hash": "AlfxN1teZCWqIn/MVb0ZV8W4A9c",
+	"spine": "3.8.55",
+	"x": -100.47,
 	"y": -9.21,
-	"width": 264.5,
+	"width": 260.65,
 	"height": 573.31,
 	"images": "./images/",
 	"audio": ""
@@ -383,16 +383,15 @@
 	{ "name": "front-arm", "bone": "root", "attachment": "front-arm" },
 	{ "name": "back-leg-path", "bone": "hip", "attachment": "back-leg-path" },
 	{ "name": "front-leg-path", "bone": "hip", "attachment": "front-leg-path" },
-	{ "name": "front-arm-path", "bone": "spine4" },
-	{ "name": "rear-arm-path", "bone": "spine4" }
+	{ "name": "front-arm-path", "bone": "spine4", "attachment": "front-arm-path" },
+	{ "name": "back-arm-path", "bone": "spine4", "attachment": "back-arm-path" }
 ],
 "ik": [
 	{
 		"name": "back-arm-ik",
 		"order": 3,
 		"bones": [ "back-arm-ik1", "back-arm-ik2" ],
-		"target": "back-arm-ik-target",
-		"mix": 0
+		"target": "back-arm-ik-target"
 	},
 	{
 		"name": "back-leg-ik",
@@ -404,8 +403,7 @@
 		"name": "front-arm-ik",
 		"order": 2,
 		"bones": [ "front-arm-ik1", "front-arm-ik2" ],
-		"target": "front-arm-ik-target",
-		"mix": 0
+		"target": "front-arm-ik-target"
 	},
 	{
 		"name": "front-leg-ik",
@@ -450,12 +448,10 @@
 		"name": "back-arm-path",
 		"order": 7,
 		"bones": [ "back-arm1", "back-arm2", "back-arm3", "back-arm4" ],
-		"target": "rear-arm-path",
+		"target": "back-arm-path",
 		"spacingMode": "percent",
 		"rotateMode": "chainScale",
-		"spacing": 0.25,
-		"rotateMix": 0,
-		"translateMix": 0
+		"spacing": 0.25
 	},
 	{
 		"name": "back-leg-path",
@@ -473,9 +469,7 @@
 		"target": "front-arm-path",
 		"spacingMode": "percent",
 		"rotateMode": "chainScale",
-		"spacing": 0.25,
-		"rotateMix": 0,
-		"translateMix": 0
+		"spacing": 0.25
 	},
 	{
 		"name": "front-leg-path",
@@ -494,11 +488,19 @@
 			"front-arm-path": {
 				"front-arm-path": {
 					"type": "path",
-					"lengths": [ 73.64, 135.97, 291.4 ],
+					"lengths": [ 73.62, 136.68, 287.93 ],
 					"vertexCount": 9,
 					"vertices": [ 1, 31, -21.12, -1.6, 1, 1, 31, 0.92, -0.29, 1, 1, 31, 16.41, 0.79, 1, 2, 31, 53.26, -1.74, 0.504, 32, -15.94, 3.84, 0.496, 2, 31, 74.54, 0.19, 0.504, 32, 4.75, -1.5, 0.496, 2, 31, 94.74, 2.31, 0.504, 32, 24.5, -6.3, 0.496, 1, 32, 46.12, -4.58, 1, 1, 32, 66.56, -0.12, 1, 1, 31, 147.94, 32.21, 1 ]
 				}
 			},
+			"back-arm-path": {
+				"back-arm-path": {
+					"type": "path",
+					"lengths": [ 66.62, 131.78, 280.97 ],
+					"vertexCount": 9,
+					"vertices": [ 1, 7, -19.59, 1.53, 1, 1, 7, 0.28, -0.13, 1, 1, 7, 17.08, -1.7, 1, 2, 7, 47.35, -3.26, 0.504, 8, -19.18, 3.46, 0.496, 2, 7, 66.76, 0.15, 0.504, 8, 0.23, 0.07, 0.496, 2, 7, 86.18, 3.55, 0.504, 8, 19.65, -3.32, 0.496, 1, 8, 46.48, -3.02, 1, 1, 8, 65.15, 0.11, 1, 1, 7, 144.73, 31.88, 1 ]
+				}
+			},
 			"head": {
 				"head": { "x": 45.65, "y": -7.92, "rotation": -70.44, "width": 87, "height": 102 }
 			},
@@ -565,14 +567,6 @@
 					"width": 145,
 					"height": 221
 				}
-			},
-			"rear-arm-path": {
-				"rear-arm-path": {
-					"type": "path",
-					"lengths": [ 66.62, 131.77, 281.13 ],
-					"vertexCount": 9,
-					"vertices": [ 1, 7, -19.59, 1.53, 1, 1, 7, 0.28, -0.13, 1, 1, 7, 17.08, -1.7, 1, 2, 7, 47.35, -3.26, 0.504, 8, -19.18, 3.46, 0.496, 2, 7, 66.76, 0.15, 0.504, 8, 0.23, 0.07, 0.496, 2, 7, 86.18, 3.55, 0.504, 8, 19.65, -3.32, 0.496, 1, 8, 46.48, -3.02, 1, 1, 8, 65.15, 0.11, 1, 1, 7, 144.73, 31.88, 1 ]
-				}
 			}
 		}
 	}
@@ -716,16 +710,6 @@
 					{ "time": 0.3333 }
 				]
 			},
-			"front-arm1": {
-				"rotate": [
-					{ "angle": -39.72 },
-					{ "time": 0.1667, "angle": -37.3 },
-					{ "time": 0.3333, "angle": 30.67 },
-					{ "time": 0.9, "angle": -53.28, "curve": 0.708, "c2": 0.01, "c3": 0.75 },
-					{ "time": 1.2333, "angle": 36 },
-					{ "time": 1.8, "angle": -39.72 }
-				]
-			},
 			"neck1": {
 				"rotate": [
 					{ "angle": 21.95, "curve": "stepped" },
@@ -768,22 +752,6 @@
 					{ "time": 1.8, "angle": -22.93 }
 				]
 			},
-			"back-arm1": {
-				"rotate": [
-					{ "angle": -17.24 },
-					{ "time": 0.1667, "angle": -18.66 },
-					{ "time": 0.3333, "angle": 324.99 },
-					{ "time": 0.5667, "angle": -6.42 },
-					{ "time": 0.9, "angle": -14.83 },
-					{ "time": 1.0667, "angle": -16.91 },
-					{ "time": 1.2333, "angle": 1.49 },
-					{ "time": 1.4, "angle": 2.56 },
-					{ "time": 1.8, "angle": -17.24 }
-				],
-				"translate": [
-					{ "x": -14.26, "y": -6.6 }
-				]
-			},
 			"back-leg-ik1": {
 				"scale": [
 					{ "x": 2.186 },
@@ -824,16 +792,6 @@
 					{ "time": 1.8 }
 				]
 			},
-			"front-arm3": {
-				"rotate": [
-					{},
-					{ "time": 0.1667, "angle": 17.37 },
-					{ "time": 0.3333, "angle": 31.94 },
-					{ "time": 0.9, "angle": 4.76, "curve": 0.708, "c2": 0.01, "c3": 0.75 },
-					{ "time": 1.2333, "angle": 39.97 },
-					{ "time": 1.8 }
-				]
-			},
 			"spine2": {
 				"rotate": [
 					{ "angle": -3.49 },
@@ -861,19 +819,6 @@
 					{ "time": 1.8, "angle": -20.41 }
 				]
 			},
-			"back-arm3": {
-				"rotate": [
-					{ "angle": 26.23 },
-					{ "time": 0.1667, "angle": 53.15 },
-					{ "time": 0.3333, "angle": 116.26 },
-					{ "time": 0.5667, "angle": 35.72 },
-					{ "time": 0.9, "angle": 39.33 },
-					{ "time": 1.0667, "angle": 41.19 },
-					{ "time": 1.2333, "angle": 78.1 },
-					{ "time": 1.4, "angle": 36.16 },
-					{ "time": 1.8, "angle": 26.23 }
-				]
-			},
 			"back-foot3": {
 				"rotate": [
 					{ "angle": 11.35 },
@@ -956,8 +901,118 @@
 				]
 			}
 		},
+		"ik": {
+			"front-arm-ik": [
+				{ "mix": 0 }
+			],
+			"back-arm-ik": [
+				{ "mix": 0 }
+			]
+		},
+		"path": {
+			"back-arm-path": {
+				"mix": [
+					{ "rotateMix": 0, "translateMix": 0 }
+				]
+			}
+		},
 		"deform": {
 			"default": {
+				"back-leg": {
+					"back-leg": [
+						{ "time": 0.3 },
+						{
+							"time": 0.3333,
+							"offset": 68,
+							"vertices": [ -1.72897, 2.75446, -1.5253, 2.94189, 0.0625, 3.6552, 0.01776, 3.65398, 0, 0, 0, 0, 0, 0, 0.0625, 3.6552, 0.01776, 3.65398, 0.90137, 3.54112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.98724, -1.57397, -0.03339, -2.08873, -0.0108, -2.08799, -0.51434, -2.02362, 0.98724, -1.57397, 0.87167, -1.68002, -0.03339, -2.08873, -0.0108, -2.08799 ]
+						},
+						{ "time": 0.4667, "curve": "stepped" },
+						{ "time": 1.3333 },
+						{
+							"time": 1.4333,
+							"offset": 110,
+							"vertices": [ 2.52802, 0.00428, -0.03569, -4.90118, -3.71692, -3.19397, -4.88019, -0.43807, 5.17279, -0.0625, 5.1499, -0.4769, -0.07238, -10.06842, -7.6351, -6.56073, 6.64206, -0.09958, 6.61151, -0.62643, -0.09275, -12.93915, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.01242, -1.65533, -1.25543, -1.0787, 0.86096, 0.02682, -0.01242, -1.65533, -1.25543, -1.0787 ]
+						},
+						{ "time": 1.5 }
+					]
+				},
+				"front-leg-path": {
+					"front-leg-path": [
+						{ "time": 0.5667 },
+						{
+							"time": 0.6333,
+							"vertices": [ 0.16366, -9.90768, 0, 0, -1.90419, 16.9905, 16.55858, -93.6721, 21.4361, -76.03695, -0.72391, -31.37989, 8.2138, -30.29725, -24.90733, 16.177, -28.83566, 5.62576, 82.90022, -63.82897, 0, 0, -39.50021, -13.99933 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 0.20398, -12.34892, 0, 0, -2.37338, 21.17692, 20.63858, -116.75269, 26.71791, -94.77228, -0.90228, -39.11182, 10.23766, -37.76243, -31.04443, 20.16298, -35.9407, 7.01193, 22.68159, 24.72715, 0, 0, -292.39255, -342.79443 ]
+						},
+						{ "time": 0.8 }
+					]
+				},
+				"back-leg-path": {
+					"back-leg-path": [
+						{ "time": 1.4333 },
+						{
+							"time": 1.5,
+							"vertices": [ 4.67719, -35.44354, 0, 0, -11.37146, 49.53738, -20.9989, -109.72336, 65.45837, -90.53627, -9.56653, -24.74756, 11.45203, -23.93552, -19.0719, 47.32281, -47.53955, 18.58409, 34.69244, -51.5341, 0, 0, 13.30164, -100.17206 ]
+						},
+						{
+							"time": 1.5667,
+							"vertices": [ -0.9635, -22.43964, 0, 0, -13.80389, 27.61459, -41.00647, -55.1597, 7.62653, -96.25755, -24.12604, -24.11285, 7.19531, -37.87421, -31.47302, 7.7796, -12.34546, -3.32329, 26.55981, -38.73888, 0, 0, -13.62085, -280.84912 ]
+						},
+						{ "time": 1.6667 }
+					]
+				},
+				"back-arm-path": {
+					"back-arm-path": [
+						{
+							"offset": 6,
+							"vertices": [ 16.3118, -18.11099, 9.38689, -22.49081, 16.3118, -18.11099, 9.38689, -22.49081, 16.3118, -18.11099, 9.38689, -22.49081, 5.21931, -14.09406, 5.21931, -14.09406, 9.59631, -11.56969 ]
+						},
+						{
+							"time": 0.2667,
+							"vertices": [ 17.29437, 7.04849, 14.79962, -1.07825, 14.33475, -8.70247, 21.24185, -39.66567, 6.89394, -44.45944, 10.76428, -25.42518, 1.72866, -27.55225, 3.7822, -4.32903, 2.13338, -5.33344, -27.0453, 5.88416, -38.02032, 26.4173, -61.80768, 21.71147 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 17.95615, 8.14108, 14.79962, -1.07825, 16.71317, -11.68106, 14.02496, -41.70744, -0.59032, -43.99492, 3.64664, -36.43639, -8.63589, -35.58226, -6.87915, -31.30511, -16.86504, -27.25218, -49.13799, 7.42427, -64.93407, 27.8885, -91.43912, 13.72736 ]
+						},
+						{
+							"time": 0.5,
+							"vertices": [ 15.38278, 2.32626, 14.79962, -1.07825, 27.35364, -7.20694, 21.21991, -16.91832, 14.41569, -22.99199, 13.32208, -15.46672, 7.44369, -19.00499, 4.28751, -14.48547, -0.75341, -15.08464, -2.17496, 10.12184, -12.25928, 25.64998, -34.96158, 29.44566 ]
+						},
+						{
+							"time": 0.7333,
+							"vertices": [ 15.09308, 1.05288, 14.79962, -1.07825, 29.31471, -5.56345, 22.04147, -11.23985, 17.07265, -17.90605, 14.88409, -12.29247, 9.96931, -16.52739, 5.96237, -13.67168, 1.09623, -14.87114, 6.63299, 1.45528, 0.94646, 14.0547, -13.72948, 21.76353 ]
+						},
+						{
+							"time": 0.9,
+							"vertices": [ 15.39021, 2.35476, 14.79962, -1.07825, 30.48502, -8.07974, 20.9438, -17.10649, 14.09298, -23.07713, 13.78642, -18.1591, 6.98963, -21.69847, 4.8647, -19.53832, -1.88345, -20.04222, -2.67197, -4.61296, 1.39996, 6.57039, -5.39857, 11.80521 ],
+							"curve": 0.524,
+							"c2": 0.16,
+							"c3": 0.756,
+							"c4": 0.42
+						},
+						{
+							"time": 1.1667,
+							"vertices": [ 14.85753, -0.48447, 14.79962, -1.07825, 31.73373, -3.33627, 23.01347, -7.29637, 19.29711, -14.50829, 15.4052, -6.61467, 12.34302, -11.34386, 7.84123, -5.91851, 5.43888, -8.17979, -11.60212, 24.89491, -17.7134, 42.73946, -43.67604, 43.44828 ]
+						},
+						{
+							"time": 1.2333,
+							"vertices": [ 14.73198, -2.46391, 14.79962, -1.07825, 33.47556, 0.01297, 25.82463, -1.04625, 24.02032, -9.54625, 14.75859, 1.42812, 14.39835, -3.54301, 3.12071, 3.508, 4.10908, 2.27547, -21.98957, 36.34486, -37.84533, 60.85518, -77.18501, 53.72379 ]
+						},
+						{
+							"time": 1.6333,
+							"vertices": [ 14.83754, -0.66654, 14.79962, -1.07825, 31.51825, -3.00034, 29.67143, -10.80186, 24.41619, -20.02477, 18.60539, -8.3275, 14.79422, -14.02153, 6.96751, -6.24761, 4.50495, -8.20305, 4.14837, -1.69408, 6.80164, 7.88496, -0.36778, 14.53739 ]
+						},
+						{
+							"time": 1.8,
+							"offset": 6,
+							"vertices": [ 16.3118, -18.11099, 9.38689, -22.49081, 16.3118, -18.11099, 9.38689, -22.49081, 16.3118, -18.11099, 9.38689, -22.49081, 5.21931, -14.09406, 5.21931, -14.09406, 9.59631, -11.56969 ]
+						}
+					]
+				},
 				"body": {
 					"body": [
 						{},
@@ -992,50 +1047,60 @@
 						{ "time": 1.4333 }
 					]
 				},
-				"back-leg": {
-					"back-leg": [
-						{ "time": 0.3 },
+				"front-arm-path": {
+					"front-arm-path": [
+						{
+							"offset": 6,
+							"vertices": [ -12.9209, -39.95981, -25.88348, -33.0735, -2.39359, -54.66837, -21.06042, -50.50607, -3.72093, -64.40555, -25.65784, -59.19217, -16.16644, -81.12411, -2.1976, -88.32147, 30.24409, -88.15561 ],
+							"curve": 0.631,
+							"c2": 0.23,
+							"c3": 0.879,
+							"c4": 0.52
+						},
+						{
+							"time": 0.2667,
+							"offset": 6,
+							"vertices": [ -6.99447, -1.70715, -7.1554, 0.80232, -3.59954, 3.67111, -2.11671, 4.68478, -4.33497, 7.29962, -1.55899, 8.34363, 27.56593, 41.67679, 17.74266, 71.44806, -24.705, 82.18048 ]
+						},
 						{
 							"time": 0.3333,
-							"offset": 68,
-							"vertices": [ -1.72897, 2.75446, -1.5253, 2.94189, 0.0625, 3.6552, 0.01776, 3.65398, 0, 0, 0, 0, 0, 0, 0.0625, 3.6552, 0.01776, 3.65398, 0.90137, 3.54112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.98724, -1.57397, -0.03339, -2.08873, -0.0108, -2.08799, -0.51434, -2.02362, 0.98724, -1.57397, 0.87167, -1.68002, -0.03339, -2.08873, -0.0108, -2.08799 ]
+							"offset": 6,
+							"vertices": [ 8.44957, 32.31442, 19.05118, 27.43202, -7.45588, 46.37772, 8.95805, 46.11075, -19.18214, 69.54529, 5.91905, 71.89777, -7.70708, 98.66168, -28.33836, 131.79349, -94.23925, 121.84799 ]
 						},
-						{ "time": 0.4667, "curve": "stepped" },
-						{ "time": 1.3333 },
 						{
-							"time": 1.4333,
-							"offset": 110,
-							"vertices": [ 2.52802, 0.00428, -0.03569, -4.90118, -3.71692, -3.19397, -4.88019, -0.43807, 5.17279, -0.0625, 5.1499, -0.4769, -0.07238, -10.06842, -7.6351, -6.56073, 6.64206, -0.09958, 6.61151, -0.62643, -0.09275, -12.93915, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.01242, -1.65533, -1.25543, -1.0787, 0.86096, 0.02682, -0.01242, -1.65533, -1.25543, -1.0787 ]
+							"time": 0.5,
+							"offset": 6,
+							"vertices": [ -4.46663, -1.64532, -4.76291, -0.00836, -0.87421, 9.57532, 2.47301, 9.29126, 2.54158, 19.93958, 9.24467, 17.84605, 11.96303, 39.65105, 18.64986, 73.29482, -18.68584, 83.59488 ]
 						},
-						{ "time": 1.5 }
-					]
-				},
-				"back-leg-path": {
-					"back-leg-path": [
-						{ "time": 1.4333 },
 						{
-							"time": 1.5,
-							"vertices": [ 4.67719, -35.44354, 0, 0, -11.37146, 49.53738, -20.9989, -109.72336, 65.45837, -90.53627, -9.56653, -24.74756, 11.45203, -23.93552, -19.0719, 47.32281, -47.53955, 18.58409, 34.69244, -51.5341, 0, 0, 13.30164, -100.17206 ]
+							"time": 0.7333,
+							"vertices": [ 1.51892, 9.45587, 0, 0, 13.39709, -12.54466, -14.78566, -30.5946, -24.41342, -23.63802, -4.34327, -35.02473, -16.13185, -31.39085, 2.1338, -39.26007, -11.50972, -37.59723, -15.87029, -47.6066, 18.76308, -41.01509, 31.61115, -31.85007 ]
 						},
 						{
-							"time": 1.5667,
-							"vertices": [ -0.9635, -22.43964, 0, 0, -13.80389, 27.61459, -41.00647, -55.1597, 7.62653, -96.25755, -24.12604, -24.11285, 7.19531, -37.87421, -31.47302, 7.7796, -12.34546, -3.32329, 26.55981, -38.73888, 0, 0, -13.62085, -280.84912 ]
+							"time": 0.9,
+							"vertices": [ 9.82782, 19.70647, 0, 0, 3.91858, -30.30774, -25.13997, -44.18149, -38.81207, -32.83302, -19.46461, -65.00096, -40.64604, -54.33342, -17.7224, -82.51295, -45.03865, -71.37659, -54.09508, -88.97668, -26.63197, -110.76451, 15.70649, -122.51018 ],
+							"curve": 0.427,
+							"c2": 0.08,
+							"c3": 0.756,
+							"c4": 0.43
 						},
-						{ "time": 1.6667 }
-					]
-				},
-				"front-leg-path": {
-					"front-leg-path": [
-						{ "time": 0.5667 },
 						{
-							"time": 0.6333,
-							"vertices": [ 0.16366, -9.90768, 0, 0, -1.90419, 16.9905, 16.55858, -93.6721, 21.4361, -76.03695, -0.72391, -31.37989, 8.2138, -30.29725, -24.90733, 16.177, -28.83566, 5.62576, 82.90022, -63.82897, 0, 0, -39.50021, -13.99933 ]
+							"time": 1.1667,
+							"vertices": [ 1.11322, -5.72798, 0, 0, 30.58588, 14.41299, 2.31645, 14.79144, 7.25702, 13.09201, -5.5185, 19.48421, 1.5204, 20.19333, -5.93156, 27.15349, 3.76659, 27.53638, 2.69209, 66.05923, -3.6227, 102.98009, -55.09716, 104.45802 ]
 						},
 						{
-							"time": 0.7,
-							"vertices": [ 0.20398, -12.34892, 0, 0, -2.37338, 21.17692, 20.63858, -116.75269, 26.71791, -94.77228, -0.90228, -39.11182, 10.23766, -37.76243, -31.04443, 20.16298, -35.9407, 7.01193, 22.68159, 24.72715, 0, 0, -292.39255, -342.79443 ]
+							"time": 1.2333,
+							"vertices": [ 2.51172, -8.99214, 0, 0, 17.94202, 16.55356, -0.17567, 30.39557, 10.29065, 28.60089, -13.8863, 44.80336, 2.37764, 46.84573, -24.8344, 62.67894, -1.75221, 67.39691, -24.34264, 104.81256, -53.6653, 143.94118, -125.4433, 122.95863 ]
 						},
-						{ "time": 0.8 }
+						{
+							"time": 1.6333,
+							"vertices": [ 0.50366, 6.17654, 0, 0, 23.90173, -9.97963, 7.67455, -20.09877, 0.29907, -21.51508, 3.98699, -21.66397, -3.70329, -21.71597, 5.89143, -23.30389, -2.47792, -23.91199, 13.15443, -25.63168, 30.1389, -9.45039, 27.80377, 5.99608 ]
+						},
+						{
+							"time": 1.8,
+							"offset": 6,
+							"vertices": [ -12.9209, -39.95981, -25.88348, -33.0735, -2.39359, -54.66837, -21.06042, -50.50607, -3.72093, -64.40555, -25.65784, -59.19217, -16.16644, -81.12411, -2.1976, -88.32147, 30.24409, -88.15561 ]
+						}
 					]
 				}
 			}

BIN
examples/stretchyman/export/stretchyman-pro.skel


Fișier diff suprimat deoarece este prea mare
+ 0 - 511
examples/stretchyman/export/stretchyman-stretchy-ik-pro.json


BIN
examples/stretchyman/export/stretchyman-stretchy-ik-pro.skel


+ 0 - 12
examples/stretchyman/images/rename.bat

@@ -1,12 +0,0 @@
-@echo off
-Setlocal enabledelayedexpansion
-
-Set "Pattern= "
-Set "Replace=-"
-
-For %%a in (*.*) Do (
-    Set "File=%%~a"
-    Ren "%%a" "!File:%Pattern%=%Replace%!"
-)
-
-Pause&Exit

BIN
examples/stretchyman/stretchyman-pro.spine


BIN
examples/stretchyman/stretchyman-stretchy-ik-pro.spine


Fișier diff suprimat deoarece este prea mare
+ 382 - 408
examples/tank/export/tank-pro.json


BIN
examples/tank/export/tank-pro.skel


BIN
examples/tank/tank-pro.spine


Fișier diff suprimat deoarece este prea mare
+ 3 - 3
examples/vine/export/vine-pro.json


BIN
examples/vine/export/vine-pro.skel


BIN
examples/vine/vine-pro.spine


+ 80 - 80
examples/windmill/export/windmill-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "3Yay4jXawsA8NTGIpvFIs8xO1Ok",
-	"spine": "3.8.44-beta",
+	"spine": "3.8.55",
 	"x": -564.6,
 	"y": -335.4,
 	"width": 1124.2,
@@ -601,6 +601,9 @@
 	{
 		"name": "default",
 		"attachments": {
+			"tree1-leaves2": {
+				"tree1-leaves2": { "x": 45.6, "y": -4.99, "rotation": -102.15, "width": 95, "height": 99 }
+			},
 			"flower-leaf-back": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
@@ -616,8 +619,8 @@
 			"flower-leaf-front5": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower-stem10": {
-				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
+			"heat2": {
+				"heat": { "x": 0.38, "y": 0.46, "width": 96, "height": 103 }
 			},
 			"windmill-blades": {
 				"windmill-blades": { "x": -0.43, "y": -0.99, "width": 542, "height": 540 }
@@ -631,26 +634,27 @@
 			"flower-stem6": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
-			"flower-leaf-front": {
-				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
+			"flower4": {
+				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
+				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
+				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
 			"windmill-blades-wood-h": {
 				"windmill-blades-wood-h": { "x": -0.43, "y": -0.49, "width": 542, "height": 25 }
 			},
-			"heat3": {
-				"heat": { "x": 0.38, "y": 0.46, "width": 96, "height": 103 }
-			},
 			"flower-leaf-front7": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back14": {
-				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			"flower15": {
+				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
+				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
+				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
 			"flower-stem2": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
-			"flower-leaf-back6": {
-				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			"flower-stem3": {
+				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
 			"flower-stem4": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
@@ -661,8 +665,8 @@
 			"tree1-leaves1": {
 				"tree1-leaves1": { "x": 46.78, "y": 1.49, "rotation": -57.46, "width": 97, "height": 106 }
 			},
-			"tree1-leaves2": {
-				"tree1-leaves2": { "x": 45.6, "y": -4.99, "rotation": -102.15, "width": 95, "height": 99 }
+			"windmill-blades-wood-v": {
+				"windmill-blades-wood-v": { "x": -0.43, "y": -0.99, "width": 26, "height": 540 }
 			},
 			"tree1-leaves3": {
 				"tree1-leaves3": { "x": 38.15, "y": 0.32, "rotation": -87.95, "width": 85, "height": 84 }
@@ -673,42 +677,40 @@
 			"tree2-leaves4": {
 				"tree2-leaves4": { "x": 38.96, "y": 3.96, "rotation": -52.93, "width": 85, "height": 84 }
 			},
-			"flower-shadow2": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"tree2-leaves5": {
+				"tree2-leaves5": { "x": -13.41, "y": -0.39, "rotation": -52.93, "width": 84, "height": 84 }
 			},
 			"flower-shadow3": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"flower3": {
-				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
-				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
-				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
+			"flower-shadow4": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"windmill-blades-wood-v": {
-				"windmill-blades-wood-v": { "x": -0.43, "y": -0.99, "width": 26, "height": 540 }
+			"flower-shadow5": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
 			"flower-leaf-back11": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back12": {
-				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			"flower14": {
+				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
+				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
+				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
-			"flower-shadow8": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"flower-leaf-front12": {
+				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower-shadow9": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"flower-leaf-back14": {
+				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower-leaf-back15": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back10": {
-				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			"flower-leaf-front": {
+				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower4": {
-				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
-				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
-				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
+			"flower-shadow8": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
 			"flower-leaf-back2": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
@@ -716,22 +718,24 @@
 			"flower-leaf-back3": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back4": {
-				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			"flower13": {
+				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
+				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
+				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
 			"flower-leaf-back5": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back8": {
+			"flower-leaf-back6": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower-leaf-back7": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-front11": {
-				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
+			"flower-leaf-back8": {
+				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
-			"flower-leaf-back13": {
+			"flower-leaf-back9": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower2": {
@@ -750,7 +754,7 @@
 			"tree1-trunk": {
 				"tree1-trunk": { "x": -438.7, "y": 60.3, "width": 127, "height": 165 }
 			},
-			"flower6": {
+			"flower5": {
 				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
@@ -765,41 +769,36 @@
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
-			"flower14": {
+			"flower9": {
 				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
-			"flower15": {
-				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
-				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
-				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
+			"flower-stem7": {
+				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
 			"tree2-leaves3": {
 				"tree2-leaves3": { "x": 51.94, "y": -1.47, "rotation": -83.85, "width": 87, "height": 84 }
 			},
-			"heat2": {
-				"heat": { "x": 0.38, "y": 0.46, "width": 96, "height": 103 }
-			},
-			"flower13": {
+			"flower12": {
 				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
 			},
-			"flower-shadow6": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"heat3": {
+				"heat": { "x": 0.38, "y": 0.46, "width": 96, "height": 103 }
 			},
-			"flower-shadow4": {
+			"flower-shadow6": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"flower-shadow5": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"flower-leaf-back10": {
+				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower-shadow7": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"bush1": {
-				"bush1": { "x": 29.84, "y": -4.5, "rotation": -91.22, "width": 112, "height": 76 }
+			"flower-shadow12": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
 			"bush2": {
 				"bush2": { "x": 33.9, "y": -4.6, "rotation": -88.96, "width": 133, "height": 90 }
@@ -807,12 +806,12 @@
 			"flower-leaf-front10": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"tree2-leaves2": {
-				"tree2-leaves2": { "x": 44.48, "y": -5.49, "rotation": -113.78, "width": 95, "height": 99 }
-			},
-			"flower-leaf-front12": {
+			"flower-leaf-front11": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
+			"flower-shadow2": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			},
 			"flower-leaf-front13": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
@@ -822,8 +821,8 @@
 			"flower-leaf-front15": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower-stem3": {
-				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
+			"tree2-leaves2": {
+				"tree2-leaves2": { "x": 44.48, "y": -5.49, "rotation": -113.78, "width": 95, "height": 99 }
 			},
 			"flower-shadow": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
@@ -836,8 +835,8 @@
 			"flower-stem13": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
-			"windmill-base": {
-				"windmill-base": { "x": 5.6, "y": 126.6, "width": 1108, "height": 924 }
+			"flower-stem10": {
+				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
 			"flower-stem11": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
@@ -856,10 +855,10 @@
 			"flower-stem15": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
-			"flower-stem7": {
-				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
+			"bush1": {
+				"bush1": { "x": 29.84, "y": -4.5, "rotation": -91.22, "width": 112, "height": 76 }
 			},
-			"flower-leaf-back9": {
+			"flower-leaf-back4": {
 				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower-stem8": {
@@ -868,25 +867,26 @@
 			"rooster": {
 				"rooster": { "x": 16.59, "y": -0.13, "rotation": -88.96, "width": 54, "height": 49 }
 			},
-			"flower9": {
-				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
-				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
-				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
-			},
 			"flower-stem9": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
 			},
+			"flower-leaf-back12": {
+				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
+			},
+			"windmill-base": {
+				"windmill-base": { "x": 5.6, "y": 126.6, "width": 1108, "height": 924 }
+			},
 			"heat": {
 				"heat": { "x": 0.38, "y": 0.46, "width": 96, "height": 103 }
 			},
-			"flower-shadow10": {
+			"flower-shadow9": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
 			"flower-shadow11": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"flower-shadow12": {
-				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
+			"flower-leaf-back13": {
+				"flower-leaf-back": { "x": 10.62, "y": -3.03, "rotation": -143.81, "width": 32, "height": 22 }
 			},
 			"flower-shadow13": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
@@ -897,8 +897,8 @@
 			"flower-shadow15": {
 				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
-			"tree2-leaves5": {
-				"tree2-leaves5": { "x": -13.41, "y": -0.39, "rotation": -52.93, "width": 84, "height": 84 }
+			"flower-shadow10": {
+				"flower-shadow": { "x": 1.76, "y": -0.12, "width": 46, "height": 17 }
 			},
 			"flower-stem": {
 				"flower-stem": { "x": 23.29, "y": 0.13, "rotation": -91.26, "width": 10, "height": 53 }
@@ -906,7 +906,7 @@
 			"tree2-trunk": {
 				"tree2-trunk": { "x": 235.9, "y": 145.4, "width": 77, "height": 190 }
 			},
-			"flower12": {
+			"flower6": {
 				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }
@@ -914,7 +914,7 @@
 			"flower-leaf-front6": {
 				"flower-leaf-front": { "x": 10.75, "y": 2.94, "rotation": -32.47, "width": 32, "height": 22 }
 			},
-			"flower5": {
+			"flower3": {
 				"flower1": { "x": 16.81, "y": -0.13, "rotation": -90.78, "width": 44, "height": 38 },
 				"flower2": { "x": 16.62, "y": 0.57, "rotation": -90.78, "width": 39, "height": 34 },
 				"flower3": { "x": 12.11, "y": -0.27, "rotation": -90.78, "width": 30, "height": 31 }

BIN
examples/windmill/export/windmill-ess.skel


BIN
examples/windmill/windmill-ess.spine


+ 60 - 60
spine-as3/spine-as3-example/src/spineboy-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.33-beta",
+	"hash": "MOhkPvw8nLOrjuLm/U98aFMannI",
+	"spine": "3.8.55",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,
@@ -167,37 +167,11 @@
 	{
 		"name": "default",
 		"attachments": {
-			"eye": {
-				"eye-indifferent": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 },
-				"eye-surprised": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 }
-			},
-			"front-bracer": {
-				"front-bracer": { "x": 12.03, "y": -1.68, "rotation": 79.6, "width": 58, "height": 80 }
-			},
-			"front-fist": {
-				"front-fist-closed": { "x": 35.5, "y": 6, "rotation": 67.16, "width": 75, "height": 82 },
-				"front-fist-open": { "x": 39.57, "y": 7.76, "rotation": 67.16, "width": 86, "height": 87 }
-			},
-			"front-foot": {
-				"front-foot": { "x": 29.52, "y": 7.84, "rotation": 18.69, "width": 126, "height": 69 }
-			},
-			"front-shin": {
-				"front-shin": { "x": 55.12, "y": -3.54, "rotation": 96.59, "width": 82, "height": 184 }
-			},
-			"front-thigh": {
-				"front-thigh": { "x": 42.48, "y": 4.45, "rotation": 84.87, "width": 45, "height": 112 }
-			},
-			"front-upper-arm": {
-				"front-upper-arm": { "x": 25.2, "y": 1.17, "rotation": 97.9, "width": 46, "height": 97 }
-			},
-			"goggles": {
-				"goggles": { "x": 97.08, "y": 6.54, "rotation": -70.63, "width": 261, "height": 166 }
-			},
 			"gun": {
 				"gun": { "x": 77.3, "y": 16.4, "rotation": 60.83, "width": 210, "height": 203 }
 			},
-			"head": {
-				"head": { "x": 128.96, "y": 0.3, "rotation": -70.63, "width": 271, "height": 298 }
+			"rear-shin": {
+				"rear-shin": { "x": 58.29, "y": -2.75, "rotation": 92.37, "width": 75, "height": 178 }
 			},
 			"head-bb": {
 				"head": {
@@ -211,6 +185,30 @@
 				"mouth-oooo": { "x": 23.69, "y": -32.24, "rotation": -70.63, "width": 93, "height": 59 },
 				"mouth-smile": { "x": 23.69, "y": -32.24, "rotation": -70.63, "width": 93, "height": 59 }
 			},
+			"rear-upper-arm": {
+				"rear-upper-arm": { "x": 21.13, "y": 4.09, "rotation": 89.33, "width": 40, "height": 87 }
+			},
+			"front-upper-arm": {
+				"front-upper-arm": { "x": 25.2, "y": 1.17, "rotation": 97.9, "width": 46, "height": 97 }
+			},
+			"front-bracer": {
+				"front-bracer": { "x": 12.03, "y": -1.68, "rotation": 79.6, "width": 58, "height": 80 }
+			},
+			"front-foot": {
+				"front-foot": { "x": 29.52, "y": 7.84, "rotation": 18.69, "width": 126, "height": 69 }
+			},
+			"goggles": {
+				"goggles": { "x": 97.08, "y": 6.54, "rotation": -70.63, "width": 261, "height": 166 }
+			},
+			"front-shin": {
+				"front-shin": { "x": 55.12, "y": -3.54, "rotation": 96.59, "width": 82, "height": 184 }
+			},
+			"neck": {
+				"neck": { "x": 9.77, "y": -3.01, "rotation": -55.22, "width": 36, "height": 41 }
+			},
+			"head": {
+				"head": { "x": 128.96, "y": 0.3, "rotation": -70.63, "width": 271, "height": 298 }
+			},
 			"muzzle": {
 				"muzzle01": {
 					"x": 159.26,
@@ -249,26 +247,28 @@
 					"height": 90
 				}
 			},
-			"neck": {
-				"neck": { "x": 9.77, "y": -3.01, "rotation": -55.22, "width": 36, "height": 41 }
-			},
 			"rear-bracer": {
 				"rear-bracer": { "x": 11.15, "y": -2.2, "rotation": 66.17, "width": 56, "height": 72 }
 			},
-			"rear-foot": {
-				"rear-foot": { "x": 31.51, "y": 3.58, "rotation": 23.07, "width": 113, "height": 60 }
-			},
-			"rear-shin": {
-				"rear-shin": { "x": 58.29, "y": -2.75, "rotation": 92.37, "width": 75, "height": 178 }
-			},
 			"rear-thigh": {
 				"rear-thigh": { "x": 33.11, "y": -4.11, "rotation": 72.54, "width": 55, "height": 94 }
 			},
-			"rear-upper-arm": {
-				"rear-upper-arm": { "x": 21.13, "y": 4.09, "rotation": 89.33, "width": 40, "height": 87 }
+			"front-fist": {
+				"front-fist-closed": { "x": 35.5, "y": 6, "rotation": 67.16, "width": 75, "height": 82 },
+				"front-fist-open": { "x": 39.57, "y": 7.76, "rotation": 67.16, "width": 86, "height": 87 }
+			},
+			"eye": {
+				"eye-indifferent": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 },
+				"eye-surprised": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 }
+			},
+			"front-thigh": {
+				"front-thigh": { "x": 42.48, "y": 4.45, "rotation": 84.87, "width": 45, "height": 112 }
 			},
 			"torso": {
 				"torso": { "x": 63.61, "y": 7.12, "rotation": -94.54, "width": 98, "height": 180 }
+			},
+			"rear-foot": {
+				"rear-foot": { "x": 31.51, "y": 3.58, "rotation": 23.07, "width": 113, "height": 60 }
 			}
 		}
 	}
@@ -279,12 +279,11 @@
 "animations": {
 	"death": {
 		"slots": {
-			"eye": {
+			"mouth": {
 				"attachment": [
-					{ "name": "eye-surprised" },
-					{ "time": 0.4667, "name": "eye-indifferent" },
-					{ "time": 2.2333, "name": "eye-surprised" },
-					{ "time": 4.5333, "name": "eye-indifferent" }
+					{ "name": "mouth-oooo" },
+					{ "time": 2.2333, "name": "mouth-grind" },
+					{ "time": 4.5333, "name": "mouth-oooo" }
 				]
 			},
 			"front-fist": {
@@ -292,11 +291,12 @@
 					{ "name": "front-fist-open" }
 				]
 			},
-			"mouth": {
+			"eye": {
 				"attachment": [
-					{ "name": "mouth-oooo" },
-					{ "time": 2.2333, "name": "mouth-grind" },
-					{ "time": 4.5333, "name": "mouth-oooo" }
+					{ "name": "eye-surprised" },
+					{ "time": 0.4667, "name": "eye-indifferent" },
+					{ "time": 2.2333, "name": "eye-surprised" },
+					{ "time": 4.5333, "name": "eye-indifferent" }
 				]
 			}
 		},
@@ -483,16 +483,16 @@
 	},
 	"hit": {
 		"slots": {
-			"front-fist": {
-				"attachment": [
-					{ "time": 0.1667, "name": "front-fist-open" }
-				]
-			},
 			"mouth": {
 				"attachment": [
 					{ "name": "mouth-grind" },
 					{ "time": 0.3333, "name": "mouth-smile" }
 				]
+			},
+			"front-fist": {
+				"attachment": [
+					{ "time": 0.1667, "name": "front-fist-open" }
+				]
 			}
 		},
 		"bones": {
@@ -767,17 +767,17 @@
 	},
 	"jump": {
 		"slots": {
+			"mouth": {
+				"attachment": [
+					{ "name": "mouth-grind" }
+				]
+			},
 			"front-fist": {
 				"attachment": [
 					{ "name": "front-fist-open" },
 					{ "time": 0.2, "name": "front-fist-closed" },
 					{ "time": 0.6667, "name": "front-fist-open" }
 				]
-			},
-			"mouth": {
-				"attachment": [
-					{ "name": "mouth-grind" }
-				]
 			}
 		},
 		"bones": {

+ 24 - 24
spine-cocos2d-objc/Resources/coin-pro.json

@@ -1,13 +1,13 @@
 {
 "skeleton": {
-	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.33-beta",
+	"hash": "Dq1Q0p2Nq9WJ9gmLxp3FURbKp7Y",
+	"spine": "3.8.55",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,
 	"height": 302,
 	"images": "./images/",
-	"audio": "C:/Program Files (x86)/Spine/examples/coin-new"
+	"audio": ""
 },
 "bones": [
 	{ "name": "root" },
@@ -43,10 +43,6 @@
 				"coin-front-shine-logo": { "width": 282, "height": 282 },
 				"coin-front-shine-spineboy": { "width": 282, "height": 282 }
 			},
-			"coin-front-texture": {
-				"coin-front-logo": { "width": 305, "height": 302 },
-				"coin-front-spineboy": { "width": 305, "height": 302 }
-			},
 			"coin-side": {
 				"coin-side-straight": { "x": 0.5, "width": 17, "height": 282 }
 			},
@@ -55,6 +51,10 @@
 			},
 			"shine": {
 				"shine": { "y": 0.5, "scaleX": 1.6004, "scaleY": 1.6004, "width": 72, "height": 245 }
+			},
+			"coin-front-texture": {
+				"coin-front-logo": { "width": 305, "height": 302 },
+				"coin-front-spineboy": { "width": 305, "height": 302 }
 			}
 		}
 	}
@@ -62,23 +62,6 @@
 "animations": {
 	"animation": {
 		"slots": {
-			"coin-front-shine": {
-				"twoColor": [
-					{ "light": "7d7d7dff", "dark": "000000" },
-					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
-					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
-					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
-					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
-				],
-				"attachment": [
-					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
-					{ "time": 2, "name": "coin-front-shine-logo" }
-				]
-			},
 			"coin-front-texture": {
 				"color": [
 					{ "color": "858585ff" },
@@ -97,6 +80,23 @@
 					{ "time": 0.6667, "name": "coin-front-spineboy" },
 					{ "time": 2, "name": "coin-front-logo" }
 				]
+			},
+			"coin-front-shine": {
+				"twoColor": [
+					{ "light": "7d7d7dff", "dark": "000000" },
+					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
+					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
+					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
+					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
+				],
+				"attachment": [
+					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
+					{ "time": 2, "name": "coin-front-shine-logo" }
+				]
 			}
 		},
 		"bones": {

+ 306 - 306
spine-cocos2d-objc/Resources/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.33-beta",
+	"hash": "1UfyPXuBeBo953f8bvof4WHo5GA",
+	"spine": "3.8.55",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -205,19 +205,6 @@
 	{
 		"name": "default",
 		"attachments": {
-			"left-hand-item": {
-				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
-				"spear": {
-					"type": "mesh",
-					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
-					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
-					"hull": 14,
-					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
-					"width": 22,
-					"height": 368
-				}
-			},
 			"right-hand-item": {
 				"dagger": {
 					"type": "mesh",
@@ -230,6 +217,19 @@
 					"height": 108
 				}
 			},
+			"left-hand-item": {
+				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
+				"spear": {
+					"type": "mesh",
+					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
+					"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
+					"hull": 14,
+					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
+					"width": 22,
+					"height": 368
+				}
+			},
 			"right-hand-item2": {
 				"shield": { "rotation": 93.5, "width": 70, "height": 72 }
 			}
@@ -238,20 +238,56 @@
 	{
 		"name": "goblin",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			"right-hand": {
+				"right-hand": {
+					"name": "goblin/right-hand",
+					"type": "mesh",
+					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
+					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
+					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
+					"width": 36,
+					"height": 37
+				}
 			},
-			"head": {
-				"head": {
-					"name": "goblin/head",
+			"right-hand-thumb": {
+				"right-hand-thumb": {
+					"name": "goblin/right-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
-					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
-					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
-					"hull": 24,
-					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
-					"width": 103,
-					"height": 66
+					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
+					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
+					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
+					"hull": 5,
+					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
+					"width": 36,
+					"height": 37
+				}
+			},
+			"undies": {
+				"undies": {
+					"name": "goblin/undies",
+					"type": "mesh",
+					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
+					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
+					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"width": 36,
+					"height": 29
+				}
+			},
+			"right-lower-leg": {
+				"right-lower-leg": {
+					"name": "goblin/right-lower-leg",
+					"type": "mesh",
+					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
+					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
+					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
+					"width": 36,
+					"height": 76
 				}
 			},
 			"left-arm": {
@@ -267,56 +303,17 @@
 					"height": 35
 				}
 			},
-			"left-foot": {
-				"left-foot": {
-					"name": "goblin/left-foot",
-					"type": "mesh",
-					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
-					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
-					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
-					"width": 65,
-					"height": 31
-				}
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblin/left-hand",
+			"undie-straps": {
+				"undie-straps": {
+					"name": "goblin/undie-straps",
 					"type": "mesh",
-					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
-					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
-					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
+					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
+					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
 					"hull": 9,
-					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
-					"width": 36,
-					"height": 41
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": {
-					"name": "goblin/left-lower-leg",
-					"type": "mesh",
-					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
-					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
-					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
-					"hull": 11,
-					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
-					"width": 33,
-					"height": 70
-				}
-			},
-			"left-shoulder": {
-				"left-shoulder": {
-					"name": "goblin/left-shoulder",
-					"type": "mesh",
-					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
-					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
-					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
-					"hull": 8,
-					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
-					"width": 29,
-					"height": 44
+					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
+					"width": 55,
+					"height": 19
 				}
 			},
 			"left-upper-leg": {
@@ -345,6 +342,35 @@
 					"height": 41
 				}
 			},
+			"head": {
+				"head": {
+					"name": "goblin/head",
+					"type": "mesh",
+					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
+					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
+					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
+					"hull": 24,
+					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
+					"width": 103,
+					"height": 66
+				}
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			},
+			"left-shoulder": {
+				"left-shoulder": {
+					"name": "goblin/left-shoulder",
+					"type": "mesh",
+					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
+					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
+					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
+					"hull": 8,
+					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
+					"width": 29,
+					"height": 44
+				}
+			},
 			"pelvis": {
 				"pelvis": {
 					"name": "goblin/pelvis",
@@ -371,58 +397,6 @@
 					"height": 50
 				}
 			},
-			"right-foot": {
-				"right-foot": {
-					"name": "goblin/right-foot",
-					"type": "mesh",
-					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
-					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
-					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
-					"hull": 14,
-					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
-					"width": 63,
-					"height": 33
-				}
-			},
-			"right-hand": {
-				"right-hand": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
-					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
-					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
-					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
-					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
-					"hull": 5,
-					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-lower-leg": {
-				"right-lower-leg": {
-					"name": "goblin/right-lower-leg",
-					"type": "mesh",
-					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
-					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
-					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
-					"width": 36,
-					"height": 76
-				}
-			},
 			"right-shoulder": {
 				"right-shoulder": {
 					"name": "goblin/right-shoulder",
@@ -462,30 +436,56 @@
 					"height": 96
 				}
 			},
-			"undie-straps": {
-				"undie-straps": {
-					"name": "goblin/undie-straps",
+			"left-foot": {
+				"left-foot": {
+					"name": "goblin/left-foot",
 					"type": "mesh",
-					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
-					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
-					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
-					"hull": 9,
-					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
-					"width": 55,
-					"height": 19
+					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
+					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
+					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
+					"width": 65,
+					"height": 31
 				}
 			},
-			"undies": {
-				"undies": {
-					"name": "goblin/undies",
+			"left-hand": {
+				"left-hand": {
+					"name": "goblin/left-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
-					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
-					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
+					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
+					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"hull": 9,
+					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
 					"width": 36,
-					"height": 29
+					"height": 41
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": {
+					"name": "goblin/left-lower-leg",
+					"type": "mesh",
+					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
+					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
+					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
+					"hull": 11,
+					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
+					"width": 33,
+					"height": 70
+				}
+			},
+			"right-foot": {
+				"right-foot": {
+					"name": "goblin/right-foot",
+					"type": "mesh",
+					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
+					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
+					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
+					"hull": 14,
+					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
+					"width": 63,
+					"height": 33
 				}
 			}
 		}
@@ -493,35 +493,23 @@
 	{
 		"name": "goblingirl",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
-			},
-			"head": {
-				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			"right-hand": {
+				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-arm": {
-				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
+			"right-hand-thumb": {
+				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			"undies": {
+				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
 			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblingirl/left-hand",
-					"x": 4.34,
-					"y": 2.39,
-					"scaleX": 0.8965,
-					"scaleY": 0.8965,
-					"rotation": 30.35,
-					"width": 35,
-					"height": 40
-				}
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
 			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
+			"left-arm": {
+				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
 			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblingirl/left-upper-leg", "x": 30.22, "y": -2.95, "rotation": 89.1, "width": 33, "height": 70 }
@@ -529,24 +517,21 @@
 			"neck": {
 				"neck": { "name": "goblingirl/neck", "x": 6.16, "y": -3.15, "rotation": -98.86, "width": 35, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblingirl/pelvis", "x": -3.88, "y": 3.19, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblingirl/right-arm", "x": 16.85, "y": -0.66, "rotation": 93.53, "width": 28, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblingirl/right-shoulder", "x": 14.46, "y": 0.46, "rotation": 129.85, "width": 39, "height": 45 }
 			},
@@ -556,11 +541,26 @@
 			"torso": {
 				"torso": { "name": "goblingirl/torso", "x": 36.28, "y": -5.14, "rotation": -95.75, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			},
+			"left-hand": {
+				"left-hand": {
+					"name": "goblingirl/left-hand",
+					"x": 4.34,
+					"y": 2.39,
+					"scaleX": 0.8965,
+					"scaleY": 0.8965,
+					"rotation": 30.35,
+					"width": 35,
+					"height": 40
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
 			},
-			"undies": {
-				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			"right-foot": {
+				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
 			}
 		}
 	}
@@ -828,6 +828,41 @@
 				}
 			},
 			"goblin": {
+				"undies": {
+					"undies": [
+						{
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						},
+						{
+							"time": 0.1333,
+							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
+						},
+						{
+							"time": 0.5333,
+							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
+						},
+						{
+							"time": 0.8333,
+							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+						},
+						{
+							"time": 0.8667,
+							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+						},
+						{
+							"time": 1,
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						}
+					]
+				},
 				"head": {
 					"head": [
 						{ "curve": 0.633, "c3": 0.75 },
@@ -858,68 +893,20 @@
 						{ "time": 1 }
 					]
 				},
-				"left-foot": {
-					"left-foot": [
-						{
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						},
-						{ "time": 0.1333 },
-						{
-							"time": 0.2333,
-							"offset": 8,
-							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
-						},
-						{
-							"time": 0.3667,
-							"offset": 8,
-							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
-						},
-						{ "time": 0.5, "curve": "stepped" },
-						{ "time": 0.6333 },
-						{
-							"time": 0.7333,
-							"offset": 8,
-							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
-						},
+				"right-hand": {
+					"right-hand": [
 						{
-							"time": 0.8333,
-							"offset": 6,
-							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						},
+						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						}
 					]
 				},
-				"pelvis": {
-					"pelvis": [
-						{},
-						{
-							"time": 0.1333,
-							"offset": 6,
-							"vertices": [ -0.6899, -4.13284 ]
-						},
-						{
-							"time": 0.3333,
-							"offset": 6,
-							"vertices": [ -1.04945, -3.10477 ]
-						},
-						{
-							"time": 0.7,
-							"offset": 6,
-							"vertices": [ -1.4245, -6.30617 ]
-						},
-						{
-							"time": 0.8667,
-							"offset": 6,
-							"vertices": [ -1.13542, -1.79036 ]
-						},
-						{ "time": 1 }
-					]
-				},
 				"right-foot": {
 					"right-foot": [
 						{},
@@ -962,17 +949,41 @@
 						{ "time": 0.8667 }
 					]
 				},
-				"right-hand": {
-					"right-hand": [
+				"torso": {
+					"torso": [
 						{
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
+						},
+						{
+							"time": 0.1333,
+							"offset": 2,
+							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+						},
+						{
+							"time": 0.3,
+							"offset": 2,
+							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+						},
+						{
+							"time": 0.5,
+							"offset": 2,
+							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+						},
+						{
+							"time": 0.6333,
+							"offset": 2,
+							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+						},
+						{
+							"time": 0.8667,
+							"offset": 2,
+							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
 						},
-						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
 						}
 					]
 				},
@@ -1004,109 +1015,98 @@
 						}
 					]
 				},
-				"torso": {
-					"torso": [
-						{
-							"offset": 2,
-							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
-						},
+				"left-foot": {
+					"left-foot": [
 						{
-							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
+						{ "time": 0.1333 },
 						{
-							"time": 0.3,
-							"offset": 2,
-							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+							"time": 0.2333,
+							"offset": 8,
+							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
-							"time": 0.5,
-							"offset": 2,
-							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+							"time": 0.3667,
+							"offset": 8,
+							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
 						},
+						{ "time": 0.5, "curve": "stepped" },
+						{ "time": 0.6333 },
 						{
-							"time": 0.6333,
-							"offset": 2,
-							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+							"time": 0.7333,
+							"offset": 8,
+							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
 						},
 						{
-							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
+							"time": 0.8333,
+							"offset": 6,
+							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
 						},
 						{
 							"time": 1,
-							"offset": 2,
-							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
-				"undie-straps": {
-					"undie-straps": [
-						{
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
-						},
+				"pelvis": {
+					"pelvis": [
+						{},
 						{
 							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
+							"offset": 6,
+							"vertices": [ -0.6899, -4.13284 ]
 						},
 						{
 							"time": 0.3333,
-							"offset": 2,
-							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
+							"offset": 6,
+							"vertices": [ -1.04945, -3.10477 ]
 						},
 						{
 							"time": 0.7,
-							"offset": 2,
-							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.4245, -6.30617 ]
 						},
 						{
 							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.13542, -1.79036 ]
 						},
-						{
-							"time": 1,
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
-						}
+						{ "time": 1 }
 					]
 				},
-				"undies": {
-					"undies": [
+				"undie-straps": {
+					"undie-straps": [
 						{
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+							"offset": 2,
+							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
-						},
-						{
-							"time": 0.5333,
-							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+							"offset": 2,
+							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
-						},
-						{
-							"time": 0.8333,
-							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+							"offset": 2,
+							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 0.8667,
-							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+							"offset": 2,
+							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
 						}
 					]
 				}

Fișier diff suprimat deoarece este prea mare
+ 62 - 87
spine-cocos2d-objc/Resources/raptor-pro.json


+ 60 - 60
spine-cocos2d-objc/Resources/spineboy-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.33-beta",
+	"hash": "MOhkPvw8nLOrjuLm/U98aFMannI",
+	"spine": "3.8.55",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,
@@ -167,37 +167,11 @@
 	{
 		"name": "default",
 		"attachments": {
-			"eye": {
-				"eye-indifferent": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 },
-				"eye-surprised": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 }
-			},
-			"front-bracer": {
-				"front-bracer": { "x": 12.03, "y": -1.68, "rotation": 79.6, "width": 58, "height": 80 }
-			},
-			"front-fist": {
-				"front-fist-closed": { "x": 35.5, "y": 6, "rotation": 67.16, "width": 75, "height": 82 },
-				"front-fist-open": { "x": 39.57, "y": 7.76, "rotation": 67.16, "width": 86, "height": 87 }
-			},
-			"front-foot": {
-				"front-foot": { "x": 29.52, "y": 7.84, "rotation": 18.69, "width": 126, "height": 69 }
-			},
-			"front-shin": {
-				"front-shin": { "x": 55.12, "y": -3.54, "rotation": 96.59, "width": 82, "height": 184 }
-			},
-			"front-thigh": {
-				"front-thigh": { "x": 42.48, "y": 4.45, "rotation": 84.87, "width": 45, "height": 112 }
-			},
-			"front-upper-arm": {
-				"front-upper-arm": { "x": 25.2, "y": 1.17, "rotation": 97.9, "width": 46, "height": 97 }
-			},
-			"goggles": {
-				"goggles": { "x": 97.08, "y": 6.54, "rotation": -70.63, "width": 261, "height": 166 }
-			},
 			"gun": {
 				"gun": { "x": 77.3, "y": 16.4, "rotation": 60.83, "width": 210, "height": 203 }
 			},
-			"head": {
-				"head": { "x": 128.96, "y": 0.3, "rotation": -70.63, "width": 271, "height": 298 }
+			"rear-shin": {
+				"rear-shin": { "x": 58.29, "y": -2.75, "rotation": 92.37, "width": 75, "height": 178 }
 			},
 			"head-bb": {
 				"head": {
@@ -211,6 +185,30 @@
 				"mouth-oooo": { "x": 23.69, "y": -32.24, "rotation": -70.63, "width": 93, "height": 59 },
 				"mouth-smile": { "x": 23.69, "y": -32.24, "rotation": -70.63, "width": 93, "height": 59 }
 			},
+			"rear-upper-arm": {
+				"rear-upper-arm": { "x": 21.13, "y": 4.09, "rotation": 89.33, "width": 40, "height": 87 }
+			},
+			"front-upper-arm": {
+				"front-upper-arm": { "x": 25.2, "y": 1.17, "rotation": 97.9, "width": 46, "height": 97 }
+			},
+			"front-bracer": {
+				"front-bracer": { "x": 12.03, "y": -1.68, "rotation": 79.6, "width": 58, "height": 80 }
+			},
+			"front-foot": {
+				"front-foot": { "x": 29.52, "y": 7.84, "rotation": 18.69, "width": 126, "height": 69 }
+			},
+			"goggles": {
+				"goggles": { "x": 97.08, "y": 6.54, "rotation": -70.63, "width": 261, "height": 166 }
+			},
+			"front-shin": {
+				"front-shin": { "x": 55.12, "y": -3.54, "rotation": 96.59, "width": 82, "height": 184 }
+			},
+			"neck": {
+				"neck": { "x": 9.77, "y": -3.01, "rotation": -55.22, "width": 36, "height": 41 }
+			},
+			"head": {
+				"head": { "x": 128.96, "y": 0.3, "rotation": -70.63, "width": 271, "height": 298 }
+			},
 			"muzzle": {
 				"muzzle01": {
 					"x": 159.26,
@@ -249,26 +247,28 @@
 					"height": 90
 				}
 			},
-			"neck": {
-				"neck": { "x": 9.77, "y": -3.01, "rotation": -55.22, "width": 36, "height": 41 }
-			},
 			"rear-bracer": {
 				"rear-bracer": { "x": 11.15, "y": -2.2, "rotation": 66.17, "width": 56, "height": 72 }
 			},
-			"rear-foot": {
-				"rear-foot": { "x": 31.51, "y": 3.58, "rotation": 23.07, "width": 113, "height": 60 }
-			},
-			"rear-shin": {
-				"rear-shin": { "x": 58.29, "y": -2.75, "rotation": 92.37, "width": 75, "height": 178 }
-			},
 			"rear-thigh": {
 				"rear-thigh": { "x": 33.11, "y": -4.11, "rotation": 72.54, "width": 55, "height": 94 }
 			},
-			"rear-upper-arm": {
-				"rear-upper-arm": { "x": 21.13, "y": 4.09, "rotation": 89.33, "width": 40, "height": 87 }
+			"front-fist": {
+				"front-fist-closed": { "x": 35.5, "y": 6, "rotation": 67.16, "width": 75, "height": 82 },
+				"front-fist-open": { "x": 39.57, "y": 7.76, "rotation": 67.16, "width": 86, "height": 87 }
+			},
+			"eye": {
+				"eye-indifferent": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 },
+				"eye-surprised": { "x": 85.72, "y": -28.18, "rotation": -70.63, "width": 93, "height": 89 }
+			},
+			"front-thigh": {
+				"front-thigh": { "x": 42.48, "y": 4.45, "rotation": 84.87, "width": 45, "height": 112 }
 			},
 			"torso": {
 				"torso": { "x": 63.61, "y": 7.12, "rotation": -94.54, "width": 98, "height": 180 }
+			},
+			"rear-foot": {
+				"rear-foot": { "x": 31.51, "y": 3.58, "rotation": 23.07, "width": 113, "height": 60 }
 			}
 		}
 	}
@@ -279,12 +279,11 @@
 "animations": {
 	"death": {
 		"slots": {
-			"eye": {
+			"mouth": {
 				"attachment": [
-					{ "name": "eye-surprised" },
-					{ "time": 0.4667, "name": "eye-indifferent" },
-					{ "time": 2.2333, "name": "eye-surprised" },
-					{ "time": 4.5333, "name": "eye-indifferent" }
+					{ "name": "mouth-oooo" },
+					{ "time": 2.2333, "name": "mouth-grind" },
+					{ "time": 4.5333, "name": "mouth-oooo" }
 				]
 			},
 			"front-fist": {
@@ -292,11 +291,12 @@
 					{ "name": "front-fist-open" }
 				]
 			},
-			"mouth": {
+			"eye": {
 				"attachment": [
-					{ "name": "mouth-oooo" },
-					{ "time": 2.2333, "name": "mouth-grind" },
-					{ "time": 4.5333, "name": "mouth-oooo" }
+					{ "name": "eye-surprised" },
+					{ "time": 0.4667, "name": "eye-indifferent" },
+					{ "time": 2.2333, "name": "eye-surprised" },
+					{ "time": 4.5333, "name": "eye-indifferent" }
 				]
 			}
 		},
@@ -483,16 +483,16 @@
 	},
 	"hit": {
 		"slots": {
-			"front-fist": {
-				"attachment": [
-					{ "time": 0.1667, "name": "front-fist-open" }
-				]
-			},
 			"mouth": {
 				"attachment": [
 					{ "name": "mouth-grind" },
 					{ "time": 0.3333, "name": "mouth-smile" }
 				]
+			},
+			"front-fist": {
+				"attachment": [
+					{ "time": 0.1667, "name": "front-fist-open" }
+				]
 			}
 		},
 		"bones": {
@@ -767,17 +767,17 @@
 	},
 	"jump": {
 		"slots": {
+			"mouth": {
+				"attachment": [
+					{ "name": "mouth-grind" }
+				]
+			},
 			"front-fist": {
 				"attachment": [
 					{ "name": "front-fist-open" },
 					{ "time": 0.2, "name": "front-fist-closed" },
 					{ "time": 0.6667, "name": "front-fist-open" }
 				]
-			},
-			"mouth": {
-				"attachment": [
-					{ "name": "mouth-grind" }
-				]
 			}
 		},
 		"bones": {

Fișier diff suprimat deoarece este prea mare
+ 439 - 220
spine-cocos2d-objc/Resources/tank-pro.json


BIN
spine-cocos2dx/example/Resources/common/coin-pro.skel


+ 306 - 306
spine-cocos2dx/example/Resources/common/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.33-beta",
+	"hash": "1UfyPXuBeBo953f8bvof4WHo5GA",
+	"spine": "3.8.55",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -205,19 +205,6 @@
 	{
 		"name": "default",
 		"attachments": {
-			"left-hand-item": {
-				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
-				"spear": {
-					"type": "mesh",
-					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
-					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
-					"hull": 14,
-					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
-					"width": 22,
-					"height": 368
-				}
-			},
 			"right-hand-item": {
 				"dagger": {
 					"type": "mesh",
@@ -230,6 +217,19 @@
 					"height": 108
 				}
 			},
+			"left-hand-item": {
+				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
+				"spear": {
+					"type": "mesh",
+					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
+					"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
+					"hull": 14,
+					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
+					"width": 22,
+					"height": 368
+				}
+			},
 			"right-hand-item2": {
 				"shield": { "rotation": 93.5, "width": 70, "height": 72 }
 			}
@@ -238,20 +238,56 @@
 	{
 		"name": "goblin",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			"right-hand": {
+				"right-hand": {
+					"name": "goblin/right-hand",
+					"type": "mesh",
+					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
+					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
+					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
+					"width": 36,
+					"height": 37
+				}
 			},
-			"head": {
-				"head": {
-					"name": "goblin/head",
+			"right-hand-thumb": {
+				"right-hand-thumb": {
+					"name": "goblin/right-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
-					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
-					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
-					"hull": 24,
-					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
-					"width": 103,
-					"height": 66
+					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
+					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
+					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
+					"hull": 5,
+					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
+					"width": 36,
+					"height": 37
+				}
+			},
+			"undies": {
+				"undies": {
+					"name": "goblin/undies",
+					"type": "mesh",
+					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
+					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
+					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"width": 36,
+					"height": 29
+				}
+			},
+			"right-lower-leg": {
+				"right-lower-leg": {
+					"name": "goblin/right-lower-leg",
+					"type": "mesh",
+					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
+					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
+					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
+					"width": 36,
+					"height": 76
 				}
 			},
 			"left-arm": {
@@ -267,56 +303,17 @@
 					"height": 35
 				}
 			},
-			"left-foot": {
-				"left-foot": {
-					"name": "goblin/left-foot",
-					"type": "mesh",
-					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
-					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
-					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
-					"width": 65,
-					"height": 31
-				}
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblin/left-hand",
+			"undie-straps": {
+				"undie-straps": {
+					"name": "goblin/undie-straps",
 					"type": "mesh",
-					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
-					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
-					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
+					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
+					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
 					"hull": 9,
-					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
-					"width": 36,
-					"height": 41
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": {
-					"name": "goblin/left-lower-leg",
-					"type": "mesh",
-					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
-					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
-					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
-					"hull": 11,
-					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
-					"width": 33,
-					"height": 70
-				}
-			},
-			"left-shoulder": {
-				"left-shoulder": {
-					"name": "goblin/left-shoulder",
-					"type": "mesh",
-					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
-					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
-					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
-					"hull": 8,
-					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
-					"width": 29,
-					"height": 44
+					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
+					"width": 55,
+					"height": 19
 				}
 			},
 			"left-upper-leg": {
@@ -345,6 +342,35 @@
 					"height": 41
 				}
 			},
+			"head": {
+				"head": {
+					"name": "goblin/head",
+					"type": "mesh",
+					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
+					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
+					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
+					"hull": 24,
+					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
+					"width": 103,
+					"height": 66
+				}
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			},
+			"left-shoulder": {
+				"left-shoulder": {
+					"name": "goblin/left-shoulder",
+					"type": "mesh",
+					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
+					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
+					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
+					"hull": 8,
+					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
+					"width": 29,
+					"height": 44
+				}
+			},
 			"pelvis": {
 				"pelvis": {
 					"name": "goblin/pelvis",
@@ -371,58 +397,6 @@
 					"height": 50
 				}
 			},
-			"right-foot": {
-				"right-foot": {
-					"name": "goblin/right-foot",
-					"type": "mesh",
-					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
-					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
-					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
-					"hull": 14,
-					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
-					"width": 63,
-					"height": 33
-				}
-			},
-			"right-hand": {
-				"right-hand": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
-					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
-					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
-					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
-					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
-					"hull": 5,
-					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-lower-leg": {
-				"right-lower-leg": {
-					"name": "goblin/right-lower-leg",
-					"type": "mesh",
-					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
-					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
-					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
-					"width": 36,
-					"height": 76
-				}
-			},
 			"right-shoulder": {
 				"right-shoulder": {
 					"name": "goblin/right-shoulder",
@@ -462,30 +436,56 @@
 					"height": 96
 				}
 			},
-			"undie-straps": {
-				"undie-straps": {
-					"name": "goblin/undie-straps",
+			"left-foot": {
+				"left-foot": {
+					"name": "goblin/left-foot",
 					"type": "mesh",
-					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
-					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
-					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
-					"hull": 9,
-					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
-					"width": 55,
-					"height": 19
+					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
+					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
+					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
+					"width": 65,
+					"height": 31
 				}
 			},
-			"undies": {
-				"undies": {
-					"name": "goblin/undies",
+			"left-hand": {
+				"left-hand": {
+					"name": "goblin/left-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
-					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
-					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
+					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
+					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"hull": 9,
+					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
 					"width": 36,
-					"height": 29
+					"height": 41
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": {
+					"name": "goblin/left-lower-leg",
+					"type": "mesh",
+					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
+					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
+					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
+					"hull": 11,
+					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
+					"width": 33,
+					"height": 70
+				}
+			},
+			"right-foot": {
+				"right-foot": {
+					"name": "goblin/right-foot",
+					"type": "mesh",
+					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
+					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
+					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
+					"hull": 14,
+					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
+					"width": 63,
+					"height": 33
 				}
 			}
 		}
@@ -493,35 +493,23 @@
 	{
 		"name": "goblingirl",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
-			},
-			"head": {
-				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			"right-hand": {
+				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-arm": {
-				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
+			"right-hand-thumb": {
+				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			"undies": {
+				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
 			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblingirl/left-hand",
-					"x": 4.34,
-					"y": 2.39,
-					"scaleX": 0.8965,
-					"scaleY": 0.8965,
-					"rotation": 30.35,
-					"width": 35,
-					"height": 40
-				}
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
 			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
+			"left-arm": {
+				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
 			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblingirl/left-upper-leg", "x": 30.22, "y": -2.95, "rotation": 89.1, "width": 33, "height": 70 }
@@ -529,24 +517,21 @@
 			"neck": {
 				"neck": { "name": "goblingirl/neck", "x": 6.16, "y": -3.15, "rotation": -98.86, "width": 35, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblingirl/pelvis", "x": -3.88, "y": 3.19, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblingirl/right-arm", "x": 16.85, "y": -0.66, "rotation": 93.53, "width": 28, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblingirl/right-shoulder", "x": 14.46, "y": 0.46, "rotation": 129.85, "width": 39, "height": 45 }
 			},
@@ -556,11 +541,26 @@
 			"torso": {
 				"torso": { "name": "goblingirl/torso", "x": 36.28, "y": -5.14, "rotation": -95.75, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			},
+			"left-hand": {
+				"left-hand": {
+					"name": "goblingirl/left-hand",
+					"x": 4.34,
+					"y": 2.39,
+					"scaleX": 0.8965,
+					"scaleY": 0.8965,
+					"rotation": 30.35,
+					"width": 35,
+					"height": 40
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
 			},
-			"undies": {
-				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			"right-foot": {
+				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
 			}
 		}
 	}
@@ -828,6 +828,41 @@
 				}
 			},
 			"goblin": {
+				"undies": {
+					"undies": [
+						{
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						},
+						{
+							"time": 0.1333,
+							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
+						},
+						{
+							"time": 0.5333,
+							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
+						},
+						{
+							"time": 0.8333,
+							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+						},
+						{
+							"time": 0.8667,
+							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+						},
+						{
+							"time": 1,
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						}
+					]
+				},
 				"head": {
 					"head": [
 						{ "curve": 0.633, "c3": 0.75 },
@@ -858,68 +893,20 @@
 						{ "time": 1 }
 					]
 				},
-				"left-foot": {
-					"left-foot": [
-						{
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						},
-						{ "time": 0.1333 },
-						{
-							"time": 0.2333,
-							"offset": 8,
-							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
-						},
-						{
-							"time": 0.3667,
-							"offset": 8,
-							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
-						},
-						{ "time": 0.5, "curve": "stepped" },
-						{ "time": 0.6333 },
-						{
-							"time": 0.7333,
-							"offset": 8,
-							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
-						},
+				"right-hand": {
+					"right-hand": [
 						{
-							"time": 0.8333,
-							"offset": 6,
-							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						},
+						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						}
 					]
 				},
-				"pelvis": {
-					"pelvis": [
-						{},
-						{
-							"time": 0.1333,
-							"offset": 6,
-							"vertices": [ -0.6899, -4.13284 ]
-						},
-						{
-							"time": 0.3333,
-							"offset": 6,
-							"vertices": [ -1.04945, -3.10477 ]
-						},
-						{
-							"time": 0.7,
-							"offset": 6,
-							"vertices": [ -1.4245, -6.30617 ]
-						},
-						{
-							"time": 0.8667,
-							"offset": 6,
-							"vertices": [ -1.13542, -1.79036 ]
-						},
-						{ "time": 1 }
-					]
-				},
 				"right-foot": {
 					"right-foot": [
 						{},
@@ -962,17 +949,41 @@
 						{ "time": 0.8667 }
 					]
 				},
-				"right-hand": {
-					"right-hand": [
+				"torso": {
+					"torso": [
 						{
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
+						},
+						{
+							"time": 0.1333,
+							"offset": 2,
+							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+						},
+						{
+							"time": 0.3,
+							"offset": 2,
+							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+						},
+						{
+							"time": 0.5,
+							"offset": 2,
+							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+						},
+						{
+							"time": 0.6333,
+							"offset": 2,
+							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+						},
+						{
+							"time": 0.8667,
+							"offset": 2,
+							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
 						},
-						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
 						}
 					]
 				},
@@ -1004,109 +1015,98 @@
 						}
 					]
 				},
-				"torso": {
-					"torso": [
-						{
-							"offset": 2,
-							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
-						},
+				"left-foot": {
+					"left-foot": [
 						{
-							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
+						{ "time": 0.1333 },
 						{
-							"time": 0.3,
-							"offset": 2,
-							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+							"time": 0.2333,
+							"offset": 8,
+							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
-							"time": 0.5,
-							"offset": 2,
-							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+							"time": 0.3667,
+							"offset": 8,
+							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
 						},
+						{ "time": 0.5, "curve": "stepped" },
+						{ "time": 0.6333 },
 						{
-							"time": 0.6333,
-							"offset": 2,
-							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+							"time": 0.7333,
+							"offset": 8,
+							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
 						},
 						{
-							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
+							"time": 0.8333,
+							"offset": 6,
+							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
 						},
 						{
 							"time": 1,
-							"offset": 2,
-							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
-				"undie-straps": {
-					"undie-straps": [
-						{
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
-						},
+				"pelvis": {
+					"pelvis": [
+						{},
 						{
 							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
+							"offset": 6,
+							"vertices": [ -0.6899, -4.13284 ]
 						},
 						{
 							"time": 0.3333,
-							"offset": 2,
-							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
+							"offset": 6,
+							"vertices": [ -1.04945, -3.10477 ]
 						},
 						{
 							"time": 0.7,
-							"offset": 2,
-							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.4245, -6.30617 ]
 						},
 						{
 							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.13542, -1.79036 ]
 						},
-						{
-							"time": 1,
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
-						}
+						{ "time": 1 }
 					]
 				},
-				"undies": {
-					"undies": [
+				"undie-straps": {
+					"undie-straps": [
 						{
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+							"offset": 2,
+							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
-						},
-						{
-							"time": 0.5333,
-							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+							"offset": 2,
+							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
-						},
-						{
-							"time": 0.8333,
-							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+							"offset": 2,
+							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 0.8667,
-							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+							"offset": 2,
+							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
 						}
 					]
 				}

BIN
spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel


Fișier diff suprimat deoarece este prea mare
+ 62 - 87
spine-cocos2dx/example/Resources/common/raptor-pro.json


Fișier diff suprimat deoarece este prea mare
+ 7 - 77
spine-cocos2dx/example/Resources/common/spineboy-pro.json


BIN
spine-cocos2dx/example/Resources/common/tank-pro.skel


+ 24 - 24
spine-corona/data/coin-pro.json

@@ -1,13 +1,13 @@
 {
 "skeleton": {
-	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.33-beta",
+	"hash": "Dq1Q0p2Nq9WJ9gmLxp3FURbKp7Y",
+	"spine": "3.8.55",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,
 	"height": 302,
 	"images": "./images/",
-	"audio": "C:/Program Files (x86)/Spine/examples/coin-new"
+	"audio": ""
 },
 "bones": [
 	{ "name": "root" },
@@ -43,10 +43,6 @@
 				"coin-front-shine-logo": { "width": 282, "height": 282 },
 				"coin-front-shine-spineboy": { "width": 282, "height": 282 }
 			},
-			"coin-front-texture": {
-				"coin-front-logo": { "width": 305, "height": 302 },
-				"coin-front-spineboy": { "width": 305, "height": 302 }
-			},
 			"coin-side": {
 				"coin-side-straight": { "x": 0.5, "width": 17, "height": 282 }
 			},
@@ -55,6 +51,10 @@
 			},
 			"shine": {
 				"shine": { "y": 0.5, "scaleX": 1.6004, "scaleY": 1.6004, "width": 72, "height": 245 }
+			},
+			"coin-front-texture": {
+				"coin-front-logo": { "width": 305, "height": 302 },
+				"coin-front-spineboy": { "width": 305, "height": 302 }
 			}
 		}
 	}
@@ -62,23 +62,6 @@
 "animations": {
 	"animation": {
 		"slots": {
-			"coin-front-shine": {
-				"twoColor": [
-					{ "light": "7d7d7dff", "dark": "000000" },
-					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
-					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
-					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
-					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
-				],
-				"attachment": [
-					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
-					{ "time": 2, "name": "coin-front-shine-logo" }
-				]
-			},
 			"coin-front-texture": {
 				"color": [
 					{ "color": "858585ff" },
@@ -97,6 +80,23 @@
 					{ "time": 0.6667, "name": "coin-front-spineboy" },
 					{ "time": 2, "name": "coin-front-logo" }
 				]
+			},
+			"coin-front-shine": {
+				"twoColor": [
+					{ "light": "7d7d7dff", "dark": "000000" },
+					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
+					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
+					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
+					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
+				],
+				"attachment": [
+					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
+					{ "time": 2, "name": "coin-front-shine-logo" }
+				]
 			}
 		},
 		"bones": {

+ 306 - 306
spine-corona/data/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.33-beta",
+	"hash": "1UfyPXuBeBo953f8bvof4WHo5GA",
+	"spine": "3.8.55",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -205,19 +205,6 @@
 	{
 		"name": "default",
 		"attachments": {
-			"left-hand-item": {
-				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
-				"spear": {
-					"type": "mesh",
-					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
-					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
-					"hull": 14,
-					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
-					"width": 22,
-					"height": 368
-				}
-			},
 			"right-hand-item": {
 				"dagger": {
 					"type": "mesh",
@@ -230,6 +217,19 @@
 					"height": 108
 				}
 			},
+			"left-hand-item": {
+				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
+				"spear": {
+					"type": "mesh",
+					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
+					"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
+					"hull": 14,
+					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
+					"width": 22,
+					"height": 368
+				}
+			},
 			"right-hand-item2": {
 				"shield": { "rotation": 93.5, "width": 70, "height": 72 }
 			}
@@ -238,20 +238,56 @@
 	{
 		"name": "goblin",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			"right-hand": {
+				"right-hand": {
+					"name": "goblin/right-hand",
+					"type": "mesh",
+					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
+					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
+					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
+					"width": 36,
+					"height": 37
+				}
 			},
-			"head": {
-				"head": {
-					"name": "goblin/head",
+			"right-hand-thumb": {
+				"right-hand-thumb": {
+					"name": "goblin/right-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
-					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
-					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
-					"hull": 24,
-					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
-					"width": 103,
-					"height": 66
+					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
+					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
+					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
+					"hull": 5,
+					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
+					"width": 36,
+					"height": 37
+				}
+			},
+			"undies": {
+				"undies": {
+					"name": "goblin/undies",
+					"type": "mesh",
+					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
+					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
+					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"width": 36,
+					"height": 29
+				}
+			},
+			"right-lower-leg": {
+				"right-lower-leg": {
+					"name": "goblin/right-lower-leg",
+					"type": "mesh",
+					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
+					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
+					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
+					"width": 36,
+					"height": 76
 				}
 			},
 			"left-arm": {
@@ -267,56 +303,17 @@
 					"height": 35
 				}
 			},
-			"left-foot": {
-				"left-foot": {
-					"name": "goblin/left-foot",
-					"type": "mesh",
-					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
-					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
-					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
-					"width": 65,
-					"height": 31
-				}
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblin/left-hand",
+			"undie-straps": {
+				"undie-straps": {
+					"name": "goblin/undie-straps",
 					"type": "mesh",
-					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
-					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
-					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
+					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
+					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
 					"hull": 9,
-					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
-					"width": 36,
-					"height": 41
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": {
-					"name": "goblin/left-lower-leg",
-					"type": "mesh",
-					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
-					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
-					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
-					"hull": 11,
-					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
-					"width": 33,
-					"height": 70
-				}
-			},
-			"left-shoulder": {
-				"left-shoulder": {
-					"name": "goblin/left-shoulder",
-					"type": "mesh",
-					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
-					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
-					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
-					"hull": 8,
-					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
-					"width": 29,
-					"height": 44
+					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
+					"width": 55,
+					"height": 19
 				}
 			},
 			"left-upper-leg": {
@@ -345,6 +342,35 @@
 					"height": 41
 				}
 			},
+			"head": {
+				"head": {
+					"name": "goblin/head",
+					"type": "mesh",
+					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
+					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
+					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
+					"hull": 24,
+					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
+					"width": 103,
+					"height": 66
+				}
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			},
+			"left-shoulder": {
+				"left-shoulder": {
+					"name": "goblin/left-shoulder",
+					"type": "mesh",
+					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
+					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
+					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
+					"hull": 8,
+					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
+					"width": 29,
+					"height": 44
+				}
+			},
 			"pelvis": {
 				"pelvis": {
 					"name": "goblin/pelvis",
@@ -371,58 +397,6 @@
 					"height": 50
 				}
 			},
-			"right-foot": {
-				"right-foot": {
-					"name": "goblin/right-foot",
-					"type": "mesh",
-					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
-					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
-					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
-					"hull": 14,
-					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
-					"width": 63,
-					"height": 33
-				}
-			},
-			"right-hand": {
-				"right-hand": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
-					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
-					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
-					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
-					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
-					"hull": 5,
-					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-lower-leg": {
-				"right-lower-leg": {
-					"name": "goblin/right-lower-leg",
-					"type": "mesh",
-					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
-					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
-					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
-					"width": 36,
-					"height": 76
-				}
-			},
 			"right-shoulder": {
 				"right-shoulder": {
 					"name": "goblin/right-shoulder",
@@ -462,30 +436,56 @@
 					"height": 96
 				}
 			},
-			"undie-straps": {
-				"undie-straps": {
-					"name": "goblin/undie-straps",
+			"left-foot": {
+				"left-foot": {
+					"name": "goblin/left-foot",
 					"type": "mesh",
-					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
-					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
-					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
-					"hull": 9,
-					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
-					"width": 55,
-					"height": 19
+					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
+					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
+					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
+					"width": 65,
+					"height": 31
 				}
 			},
-			"undies": {
-				"undies": {
-					"name": "goblin/undies",
+			"left-hand": {
+				"left-hand": {
+					"name": "goblin/left-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
-					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
-					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
+					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
+					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"hull": 9,
+					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
 					"width": 36,
-					"height": 29
+					"height": 41
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": {
+					"name": "goblin/left-lower-leg",
+					"type": "mesh",
+					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
+					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
+					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
+					"hull": 11,
+					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
+					"width": 33,
+					"height": 70
+				}
+			},
+			"right-foot": {
+				"right-foot": {
+					"name": "goblin/right-foot",
+					"type": "mesh",
+					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
+					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
+					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
+					"hull": 14,
+					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
+					"width": 63,
+					"height": 33
 				}
 			}
 		}
@@ -493,35 +493,23 @@
 	{
 		"name": "goblingirl",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
-			},
-			"head": {
-				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			"right-hand": {
+				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-arm": {
-				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
+			"right-hand-thumb": {
+				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			"undies": {
+				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
 			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblingirl/left-hand",
-					"x": 4.34,
-					"y": 2.39,
-					"scaleX": 0.8965,
-					"scaleY": 0.8965,
-					"rotation": 30.35,
-					"width": 35,
-					"height": 40
-				}
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
 			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
+			"left-arm": {
+				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
 			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblingirl/left-upper-leg", "x": 30.22, "y": -2.95, "rotation": 89.1, "width": 33, "height": 70 }
@@ -529,24 +517,21 @@
 			"neck": {
 				"neck": { "name": "goblingirl/neck", "x": 6.16, "y": -3.15, "rotation": -98.86, "width": 35, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblingirl/pelvis", "x": -3.88, "y": 3.19, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblingirl/right-arm", "x": 16.85, "y": -0.66, "rotation": 93.53, "width": 28, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblingirl/right-shoulder", "x": 14.46, "y": 0.46, "rotation": 129.85, "width": 39, "height": 45 }
 			},
@@ -556,11 +541,26 @@
 			"torso": {
 				"torso": { "name": "goblingirl/torso", "x": 36.28, "y": -5.14, "rotation": -95.75, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			},
+			"left-hand": {
+				"left-hand": {
+					"name": "goblingirl/left-hand",
+					"x": 4.34,
+					"y": 2.39,
+					"scaleX": 0.8965,
+					"scaleY": 0.8965,
+					"rotation": 30.35,
+					"width": 35,
+					"height": 40
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
 			},
-			"undies": {
-				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			"right-foot": {
+				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
 			}
 		}
 	}
@@ -828,6 +828,41 @@
 				}
 			},
 			"goblin": {
+				"undies": {
+					"undies": [
+						{
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						},
+						{
+							"time": 0.1333,
+							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
+						},
+						{
+							"time": 0.5333,
+							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
+						},
+						{
+							"time": 0.8333,
+							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+						},
+						{
+							"time": 0.8667,
+							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+						},
+						{
+							"time": 1,
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						}
+					]
+				},
 				"head": {
 					"head": [
 						{ "curve": 0.633, "c3": 0.75 },
@@ -858,68 +893,20 @@
 						{ "time": 1 }
 					]
 				},
-				"left-foot": {
-					"left-foot": [
-						{
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						},
-						{ "time": 0.1333 },
-						{
-							"time": 0.2333,
-							"offset": 8,
-							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
-						},
-						{
-							"time": 0.3667,
-							"offset": 8,
-							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
-						},
-						{ "time": 0.5, "curve": "stepped" },
-						{ "time": 0.6333 },
-						{
-							"time": 0.7333,
-							"offset": 8,
-							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
-						},
+				"right-hand": {
+					"right-hand": [
 						{
-							"time": 0.8333,
-							"offset": 6,
-							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						},
+						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						}
 					]
 				},
-				"pelvis": {
-					"pelvis": [
-						{},
-						{
-							"time": 0.1333,
-							"offset": 6,
-							"vertices": [ -0.6899, -4.13284 ]
-						},
-						{
-							"time": 0.3333,
-							"offset": 6,
-							"vertices": [ -1.04945, -3.10477 ]
-						},
-						{
-							"time": 0.7,
-							"offset": 6,
-							"vertices": [ -1.4245, -6.30617 ]
-						},
-						{
-							"time": 0.8667,
-							"offset": 6,
-							"vertices": [ -1.13542, -1.79036 ]
-						},
-						{ "time": 1 }
-					]
-				},
 				"right-foot": {
 					"right-foot": [
 						{},
@@ -962,17 +949,41 @@
 						{ "time": 0.8667 }
 					]
 				},
-				"right-hand": {
-					"right-hand": [
+				"torso": {
+					"torso": [
 						{
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
+						},
+						{
+							"time": 0.1333,
+							"offset": 2,
+							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+						},
+						{
+							"time": 0.3,
+							"offset": 2,
+							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+						},
+						{
+							"time": 0.5,
+							"offset": 2,
+							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+						},
+						{
+							"time": 0.6333,
+							"offset": 2,
+							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+						},
+						{
+							"time": 0.8667,
+							"offset": 2,
+							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
 						},
-						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
 						}
 					]
 				},
@@ -1004,109 +1015,98 @@
 						}
 					]
 				},
-				"torso": {
-					"torso": [
-						{
-							"offset": 2,
-							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
-						},
+				"left-foot": {
+					"left-foot": [
 						{
-							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
+						{ "time": 0.1333 },
 						{
-							"time": 0.3,
-							"offset": 2,
-							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+							"time": 0.2333,
+							"offset": 8,
+							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
-							"time": 0.5,
-							"offset": 2,
-							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+							"time": 0.3667,
+							"offset": 8,
+							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
 						},
+						{ "time": 0.5, "curve": "stepped" },
+						{ "time": 0.6333 },
 						{
-							"time": 0.6333,
-							"offset": 2,
-							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+							"time": 0.7333,
+							"offset": 8,
+							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
 						},
 						{
-							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
+							"time": 0.8333,
+							"offset": 6,
+							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
 						},
 						{
 							"time": 1,
-							"offset": 2,
-							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
-				"undie-straps": {
-					"undie-straps": [
-						{
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
-						},
+				"pelvis": {
+					"pelvis": [
+						{},
 						{
 							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
+							"offset": 6,
+							"vertices": [ -0.6899, -4.13284 ]
 						},
 						{
 							"time": 0.3333,
-							"offset": 2,
-							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
+							"offset": 6,
+							"vertices": [ -1.04945, -3.10477 ]
 						},
 						{
 							"time": 0.7,
-							"offset": 2,
-							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.4245, -6.30617 ]
 						},
 						{
 							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.13542, -1.79036 ]
 						},
-						{
-							"time": 1,
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
-						}
+						{ "time": 1 }
 					]
 				},
-				"undies": {
-					"undies": [
+				"undie-straps": {
+					"undie-straps": [
 						{
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+							"offset": 2,
+							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
-						},
-						{
-							"time": 0.5333,
-							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+							"offset": 2,
+							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
-						},
-						{
-							"time": 0.8333,
-							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+							"offset": 2,
+							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 0.8667,
-							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+							"offset": 2,
+							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
 						}
 					]
 				}

Fișier diff suprimat deoarece este prea mare
+ 129 - 135
spine-corona/data/mix-and-match-pro.json


Fișier diff suprimat deoarece este prea mare
+ 41 - 64
spine-corona/data/owl-pro.json


Fișier diff suprimat deoarece este prea mare
+ 62 - 87
spine-corona/data/raptor-pro.json


Fișier diff suprimat deoarece este prea mare
+ 7 - 77
spine-corona/data/spineboy-pro.json


Fișier diff suprimat deoarece este prea mare
+ 34 - 26
spine-corona/data/stretchyman-pro.json


Fișier diff suprimat deoarece este prea mare
+ 0 - 512
spine-corona/data/stretchyman-stretchy-ik-pro.json


Fișier diff suprimat deoarece este prea mare
+ 439 - 220
spine-corona/data/tank-pro.json


Fișier diff suprimat deoarece este prea mare
+ 11 - 3
spine-corona/data/vine-pro.json


+ 1 - 2
spine-corona/main.lua

@@ -129,11 +129,10 @@ end
 
 table.insert(skeletons, loadSkeleton("mix-and-match.atlas", "mix-and-match-pro.json", 240, 300, 0.3, "dance"))
 table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy-pro.json", 240, 300, 0.4, "walk"))
-table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman-stretchy-ik-pro.json", 40, 300, 0.5, "sneak"))
+table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman-pro.json", 40, 300, 0.5, "sneak"))
 table.insert(skeletons, loadSkeleton("coin.atlas", "coin-pro.json", 240, 160, 0.4, "animation"))
 table.insert(skeletons, loadSkeleton("raptor.atlas", "raptor-pro.json", 200, 300, 0.25, "walk"))
 table.insert(skeletons, loadSkeleton("goblins.atlas", "goblins-pro.json", 240, 300, 0.8, "walk", "goblin"))
-table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman-pro.json", 40, 300, 0.5, "sneak"))
 table.insert(skeletons, loadSkeleton("tank.atlas", "tank-pro.json", 400, 300, 0.2, "drive"))
 table.insert(skeletons, loadSkeleton("vine.atlas", "vine-pro.json", 240, 300, 0.3, "grow"))
 

+ 24 - 24
spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json

@@ -1,13 +1,13 @@
 {
 "skeleton": {
-	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.33-beta",
+	"hash": "Dq1Q0p2Nq9WJ9gmLxp3FURbKp7Y",
+	"spine": "3.8.55",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,
 	"height": 302,
 	"images": "./images/",
-	"audio": "C:/Program Files (x86)/Spine/examples/coin-new"
+	"audio": ""
 },
 "bones": [
 	{ "name": "root" },
@@ -43,10 +43,6 @@
 				"coin-front-shine-logo": { "width": 282, "height": 282 },
 				"coin-front-shine-spineboy": { "width": 282, "height": 282 }
 			},
-			"coin-front-texture": {
-				"coin-front-logo": { "width": 305, "height": 302 },
-				"coin-front-spineboy": { "width": 305, "height": 302 }
-			},
 			"coin-side": {
 				"coin-side-straight": { "x": 0.5, "width": 17, "height": 282 }
 			},
@@ -55,6 +51,10 @@
 			},
 			"shine": {
 				"shine": { "y": 0.5, "scaleX": 1.6004, "scaleY": 1.6004, "width": 72, "height": 245 }
+			},
+			"coin-front-texture": {
+				"coin-front-logo": { "width": 305, "height": 302 },
+				"coin-front-spineboy": { "width": 305, "height": 302 }
 			}
 		}
 	}
@@ -62,23 +62,6 @@
 "animations": {
 	"animation": {
 		"slots": {
-			"coin-front-shine": {
-				"twoColor": [
-					{ "light": "7d7d7dff", "dark": "000000" },
-					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
-					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
-					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
-					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
-					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
-					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
-				],
-				"attachment": [
-					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
-					{ "time": 2, "name": "coin-front-shine-logo" }
-				]
-			},
 			"coin-front-texture": {
 				"color": [
 					{ "color": "858585ff" },
@@ -97,6 +80,23 @@
 					{ "time": 0.6667, "name": "coin-front-spineboy" },
 					{ "time": 2, "name": "coin-front-logo" }
 				]
+			},
+			"coin-front-shine": {
+				"twoColor": [
+					{ "light": "7d7d7dff", "dark": "000000" },
+					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
+					{ "time": 1.0333, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 1.3333, "light": "404040ff", "dark": "000000" },
+					{ "time": 1.6, "light": "000000ff", "dark": "7e7e7e" },
+					{ "time": 2.0022, "light": "000000ff", "dark": "000000" },
+					{ "time": 2.4, "light": "7f7f7fff", "dark": "000000" },
+					{ "time": 2.6667, "light": "7d7d7dff", "dark": "000000" }
+				],
+				"attachment": [
+					{ "time": 0.6667, "name": "coin-front-shine-spineboy" },
+					{ "time": 2, "name": "coin-front-shine-logo" }
+				]
 			}
 		},
 		"bones": {

BIN
spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel


+ 79 - 79
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "FH/RmN73bEwPPZfiWwT2Fju/FHk",
-	"spine": "3.8.33-beta",
+	"spine": "3.8.55",
 	"x": -92.53,
 	"y": -5.3,
 	"width": 234.03,
@@ -177,26 +177,29 @@
 	{
 		"name": "default",
 		"attachments": {
-			"left-hand-item": {
-				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
-				"spear": { "x": -4.56, "y": 39.2, "rotation": 13.05, "width": 22, "height": 368 }
-			},
 			"right-hand-item": {
 				"dagger": { "x": 6.52, "y": -24.16, "rotation": -8.06, "width": 26, "height": 108 }
 			},
 			"right-hand-item-top": {
 				"shield": { "rotation": 93.5, "width": 70, "height": 72 }
+			},
+			"left-hand-item": {
+				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
+				"spear": { "x": -4.56, "y": 39.2, "rotation": 13.05, "width": 22, "height": 368 }
 			}
 		}
 	},
 	{
 		"name": "goblin",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblin/eyes-closed", "x": 32.22, "y": -21.27, "rotation": -88.93, "width": 34, "height": 12 }
+			"right-hand": {
+				"right-hand": { "name": "goblin/right-hand", "x": 7.89, "y": 2.78, "rotation": 91.96, "width": 36, "height": 37 }
 			},
-			"head": {
-				"head": { "name": "goblin/head", "x": 25.74, "y": 2.33, "rotation": -92.29, "width": 103, "height": 66 }
+			"undies": {
+				"undies": { "name": "goblin/undies", "x": 6.3, "y": 0.13, "rotation": 0.92, "width": 36, "height": 29 }
+			},
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblin/right-lower-leg", "x": 25.68, "y": -3.16, "rotation": 111.84, "width": 36, "height": 76 }
 			},
 			"left-arm": {
 				"left-arm": {
@@ -210,26 +213,8 @@
 					"height": 35
 				}
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblin/left-foot", "x": 24.85, "y": 8.75, "rotation": 3.32, "width": 65, "height": 31 }
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblin/left-hand",
-					"x": 3.47,
-					"y": 3.41,
-					"scaleX": 0.8922,
-					"scaleY": 0.8922,
-					"rotation": 31.14,
-					"width": 36,
-					"height": 41
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblin/left-lower-leg", "x": 23.59, "y": -2.07, "rotation": 105.76, "width": 33, "height": 70 }
-			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblin/left-shoulder", "x": 15.56, "y": -2.27, "rotation": 62.01, "width": 29, "height": 44 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblin/undie-straps", "x": -3.88, "y": 13.11, "scaleX": 1.0896, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblin/left-upper-leg", "x": 29.69, "y": -3.87, "rotation": 89.1, "width": 33, "height": 73 }
@@ -237,21 +222,21 @@
 			"neck": {
 				"neck": { "name": "goblin/neck", "x": 10.1, "y": 0.42, "rotation": -93.7, "width": 36, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblin/head", "x": 25.74, "y": 2.33, "rotation": -92.29, "width": 103, "height": 66 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblin/eyes-closed", "x": 32.22, "y": -21.27, "rotation": -88.93, "width": 34, "height": 12 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblin/left-shoulder", "x": 15.56, "y": -2.27, "rotation": 62.01, "width": 29, "height": 44 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblin/pelvis", "x": -5.62, "y": 0.77, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblin/right-arm", "x": 16.44, "y": -1.04, "rotation": 94.32, "width": 23, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblin/right-foot", "x": 23.57, "y": 9.8, "rotation": 1.53, "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblin/right-hand", "x": 7.89, "y": 2.78, "rotation": 91.96, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblin/right-lower-leg", "x": 25.68, "y": -3.16, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblin/right-shoulder", "x": 15.68, "y": -1.03, "rotation": 130.65, "width": 39, "height": 45 }
 			},
@@ -261,46 +246,46 @@
 			"torso": {
 				"torso": { "name": "goblin/torso", "x": 38.1, "y": -3.87, "rotation": -94.95, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblin/undie-straps", "x": -3.88, "y": 13.11, "scaleX": 1.0896, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblin/left-foot", "x": 24.85, "y": 8.75, "rotation": 3.32, "width": 65, "height": 31 }
 			},
-			"undies": {
-				"undies": { "name": "goblin/undies", "x": 6.3, "y": 0.13, "rotation": 0.92, "width": 36, "height": 29 }
+			"left-hand": {
+				"left-hand": {
+					"name": "goblin/left-hand",
+					"x": 3.47,
+					"y": 3.41,
+					"scaleX": 0.8922,
+					"scaleY": 0.8922,
+					"rotation": 31.14,
+					"width": 36,
+					"height": 41
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblin/left-lower-leg", "x": 23.59, "y": -2.07, "rotation": 105.76, "width": 33, "height": 70 }
+			},
+			"right-foot": {
+				"right-foot": { "name": "goblin/right-foot", "x": 23.57, "y": 9.8, "rotation": 1.53, "width": 63, "height": 33 }
 			}
 		}
 	},
 	{
 		"name": "goblingirl",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			"right-hand": {
+				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"head": {
-				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			"undies": {
+				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			},
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
 			},
 			"left-arm": {
 				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblingirl/left-foot", "x": 25.18, "y": 7.92, "rotation": 3.32, "width": 65, "height": 31 }
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblingirl/left-hand",
-					"x": 4.34,
-					"y": 2.39,
-					"scaleX": 0.8965,
-					"scaleY": 0.8965,
-					"rotation": 30.35,
-					"width": 35,
-					"height": 40
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
-			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblingirl/left-upper-leg", "x": 30.22, "y": -2.95, "rotation": 89.1, "width": 33, "height": 70 }
@@ -308,21 +293,21 @@
 			"neck": {
 				"neck": { "name": "goblingirl/neck", "x": 6.16, "y": -3.15, "rotation": -98.86, "width": 35, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblingirl/pelvis", "x": -3.88, "y": 3.19, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblingirl/right-arm", "x": 16.85, "y": -0.66, "rotation": 93.53, "width": 28, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblingirl/right-foot", "x": 23.46, "y": 9.66, "rotation": 1.53, "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblingirl/right-shoulder", "x": 14.46, "y": 0.46, "rotation": 129.85, "width": 39, "height": 45 }
 			},
@@ -332,11 +317,26 @@
 			"torso": {
 				"torso": { "name": "goblingirl/torso", "x": 36.28, "y": -5.14, "rotation": -95.75, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblingirl/left-foot", "x": 25.18, "y": 7.92, "rotation": 3.32, "width": 65, "height": 31 }
 			},
-			"undies": {
-				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			"left-hand": {
+				"left-hand": {
+					"name": "goblingirl/left-hand",
+					"x": 4.34,
+					"y": 2.39,
+					"scaleX": 0.8965,
+					"scaleY": 0.8965,
+					"rotation": 30.35,
+					"width": 35,
+					"height": 40
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
+			},
+			"right-foot": {
+				"right-foot": { "name": "goblingirl/right-foot", "x": 23.46, "y": 9.66, "rotation": 1.53, "width": 63, "height": 33 }
 			}
 		}
 	}

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel


+ 306 - 306
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.33-beta",
+	"hash": "1UfyPXuBeBo953f8bvof4WHo5GA",
+	"spine": "3.8.55",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -205,19 +205,6 @@
 	{
 		"name": "default",
 		"attachments": {
-			"left-hand-item": {
-				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
-				"spear": {
-					"type": "mesh",
-					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
-					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
-					"hull": 14,
-					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
-					"width": 22,
-					"height": 368
-				}
-			},
 			"right-hand-item": {
 				"dagger": {
 					"type": "mesh",
@@ -230,6 +217,19 @@
 					"height": 108
 				}
 			},
+			"left-hand-item": {
+				"dagger": { "x": 7.88, "y": -23.46, "rotation": 10.48, "width": 26, "height": 108 },
+				"spear": {
+					"type": "mesh",
+					"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
+					"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+					"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
+					"hull": 14,
+					"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
+					"width": 22,
+					"height": 368
+				}
+			},
 			"right-hand-item2": {
 				"shield": { "rotation": 93.5, "width": 70, "height": 72 }
 			}
@@ -238,20 +238,56 @@
 	{
 		"name": "goblin",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			"right-hand": {
+				"right-hand": {
+					"name": "goblin/right-hand",
+					"type": "mesh",
+					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
+					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
+					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
+					"width": 36,
+					"height": 37
+				}
 			},
-			"head": {
-				"head": {
-					"name": "goblin/head",
+			"right-hand-thumb": {
+				"right-hand-thumb": {
+					"name": "goblin/right-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
-					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
-					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
-					"hull": 24,
-					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
-					"width": 103,
-					"height": 66
+					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
+					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
+					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
+					"hull": 5,
+					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
+					"width": 36,
+					"height": 37
+				}
+			},
+			"undies": {
+				"undies": {
+					"name": "goblin/undies",
+					"type": "mesh",
+					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
+					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
+					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"width": 36,
+					"height": 29
+				}
+			},
+			"right-lower-leg": {
+				"right-lower-leg": {
+					"name": "goblin/right-lower-leg",
+					"type": "mesh",
+					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
+					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
+					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
+					"hull": 11,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
+					"width": 36,
+					"height": 76
 				}
 			},
 			"left-arm": {
@@ -267,56 +303,17 @@
 					"height": 35
 				}
 			},
-			"left-foot": {
-				"left-foot": {
-					"name": "goblin/left-foot",
-					"type": "mesh",
-					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
-					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
-					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
-					"width": 65,
-					"height": 31
-				}
-			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblin/left-hand",
+			"undie-straps": {
+				"undie-straps": {
+					"name": "goblin/undie-straps",
 					"type": "mesh",
-					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
-					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
-					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
+					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
+					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
 					"hull": 9,
-					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
-					"width": 36,
-					"height": 41
-				}
-			},
-			"left-lower-leg": {
-				"left-lower-leg": {
-					"name": "goblin/left-lower-leg",
-					"type": "mesh",
-					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
-					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
-					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
-					"hull": 11,
-					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
-					"width": 33,
-					"height": 70
-				}
-			},
-			"left-shoulder": {
-				"left-shoulder": {
-					"name": "goblin/left-shoulder",
-					"type": "mesh",
-					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
-					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
-					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
-					"hull": 8,
-					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
-					"width": 29,
-					"height": 44
+					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
+					"width": 55,
+					"height": 19
 				}
 			},
 			"left-upper-leg": {
@@ -345,6 +342,35 @@
 					"height": 41
 				}
 			},
+			"head": {
+				"head": {
+					"name": "goblin/head",
+					"type": "mesh",
+					"uvs": [ 0, 0.60495, 0.14172, 0.51451, 0.24218, 0.55229, 0.32668, 0.67807, 0.37969, 0.79352, 0.53505, 0.93015, 0.86057, 1, 0.94071, 0.94169, 0.92099, 0.69924, 0.9888, 0.65498, 0.99003, 0.51643, 0.89633, 0.43562, 0.94487, 0.41917, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80755, 0.16045, 0.66699, 0.01998, 0.4734, 0.01806, 0.29215, 0.19893, 0.25393, 0.31824, 0.09117, 0.32401, 0, 0.44331, 0.43271, 0.69154, 0.46601, 0.47795, 0.35997, 0.31246, 0.73474, 0.68594, 0.72216, 0.57426, 0.8818, 0.5583, 0.80268, 0.51016 ],
+					"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
+					"vertices": [ 14.56, 50.42, 23.12, 35.48, 17.47, 26.36, 11.58, 16.87, 3.75, 11.71, -5.9, -3.92, -11.83, -37.24, -8.32, -45.64, 7.75, -44.24, 10.4, -51.34, 19.53, -51.83, 25.21, -43.16, 26.13, -47.43, 27.36, -53.16, 34.84, -53.46, 35.97, -47.34, 37.11, -41.09, 43.75, -33.98, 53.59, -19.88, 54.51, 0.04, 43.32, 19.17, 35.61, 23.41, 35.89, 40.18, 28.4, 49.87, 10.26, 5.99, 24.21, 2, 35.55, 12.48, 9.39, -25.11, 16.8, -24.31, 17.21, -40.66, 20.69, -33.02 ],
+					"hull": 24,
+					"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
+					"width": 103,
+					"height": 66
+				}
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblin/eyes-closed", "x": 29.19, "y": -24.9, "rotation": -88.93, "width": 34, "height": 12 }
+			},
+			"left-shoulder": {
+				"left-shoulder": {
+					"name": "goblin/left-shoulder",
+					"type": "mesh",
+					"uvs": [ 0.7377, 0.40692, 1, 0.75238, 1, 1, 0.62046, 1, 0.26184, 0.56602, 0, 0.29783, 0, 0, 0.44115, 0 ],
+					"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
+					"vertices": [ 15.18, 5.74, 32.17, 5.33, 41.79, 0.22, 36.63, -9.5, 14.89, -9.73, 0.9, -10.9, -10.67, -4.75, -4.67, 6.55 ],
+					"hull": 8,
+					"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
+					"width": 29,
+					"height": 44
+				}
+			},
 			"pelvis": {
 				"pelvis": {
 					"name": "goblin/pelvis",
@@ -371,58 +397,6 @@
 					"height": 50
 				}
 			},
-			"right-foot": {
-				"right-foot": {
-					"name": "goblin/right-foot",
-					"type": "mesh",
-					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
-					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
-					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
-					"hull": 14,
-					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
-					"width": 63,
-					"height": 33
-				}
-			},
-			"right-hand": {
-				"right-hand": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89824, 0.82005, 0.8259, 0.74286, 0.84224, 0.49994, 0.96357, 0.34102, 0.66024, 0 ],
-					"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
-					"vertices": [ -10.83, -9.45, 5.95, -15.35, 18.88, -14.9, 24.01, -7.5, 25.69, 5.16, 25.32, 16.08, 18.61, 17.44, 15.85, 14.74, 6.84, 15.02, 0.82, 19.19, -11.42, 7.84 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": {
-					"name": "goblin/right-hand",
-					"type": "mesh",
-					"uvs": [ 0.88538, 0.22263, 0.76168, 0.3594, 0.75089, 0.78308, 0.95326, 0.84981, 1, 0.60303 ],
-					"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
-					"vertices": [ -2.82, 15.98, 2.4, 11.72, 18.08, 11.91, 20.28, 19.28, 11.09, 20.62 ],
-					"hull": 5,
-					"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
-					"width": 36,
-					"height": 37
-				}
-			},
-			"right-lower-leg": {
-				"right-lower-leg": {
-					"name": "goblin/right-lower-leg",
-					"type": "mesh",
-					"uvs": [ 1, 0.27261, 0.81312, 0.52593, 0.79587, 0.71796, 0.95544, 0.80989, 0.85194, 0.95493, 0.47242, 1, 0.14034, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30326, 0.60611, 0 ],
-					"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
-					"vertices": [ 6.27, 8.46, 23.32, 8.05, 37.1, 12.9, 41.45, 20.83, 53.07, 21.47, 61.33, 10.06, 65.78, -1.04, 59, -9.19, 43.02, -9.82, 16.33, -20.01, -12.8, -9.26 ],
-					"hull": 11,
-					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
-					"width": 36,
-					"height": 76
-				}
-			},
 			"right-shoulder": {
 				"right-shoulder": {
 					"name": "goblin/right-shoulder",
@@ -462,30 +436,56 @@
 					"height": 96
 				}
 			},
-			"undie-straps": {
-				"undie-straps": {
-					"name": "goblin/undie-straps",
+			"left-foot": {
+				"left-foot": {
+					"name": "goblin/left-foot",
 					"type": "mesh",
-					"uvs": [ 0.36098, 0.4496, 0.66298, 0.60591, 1, 0.19486, 1, 0.57118, 0.75898, 1, 0.38698, 1, 0, 0.26433, 0, 0, 0.12498, 0 ],
-					"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
-					"vertices": [ -10.56, 12.88, 6.54, 9.91, 25.62, 17.72, 25.62, 10.57, 11.97, 2.42, -9.09, 2.42, -31, 16.4, -31, 21.42, -23.93, 21.42 ],
-					"hull": 9,
-					"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
-					"width": 55,
-					"height": 19
+					"uvs": [ 0.15734, 0.31874, 0.08195, 0.78503, 0.15884, 0.99367, 0.41633, 0.96805, 0.68823, 0.97637, 1, 0.96388, 0.99386, 0.73501, 0.85295, 0.51863, 0.61479, 0.31056, 0.46992, 0, 0.48033, 0.75604, 0.75995, 0.77706 ],
+					"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
+					"vertices": [ 2.28, 13.07, -1.77, -1.64, 3.6, -7.81, 20.26, -6.04, 37.92, -5.28, 58.13, -3.71, 57.32, 3.35, 47.78, 9.51, 31.95, 15.05, 21.99, 24.12, 24.03, 0.76, 42.21, 1.16 ],
+					"hull": 10,
+					"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
+					"width": 65,
+					"height": 31
 				}
 			},
-			"undies": {
-				"undies": {
-					"name": "goblin/undies",
+			"left-hand": {
+				"left-hand": {
+					"name": "goblin/left-hand",
 					"type": "mesh",
-					"uvs": [ 0, 0.3203, 0.14893, 0.59457, 0.22438, 1, 0.3591, 1, 0.50999, 1, 0.7956, 0.58454, 0.98421, 0.28016, 1, 0.00588, 0.46957, 0.17647, 0, 0.03933, 0.48843, 0.59123, 0.48115, 0.431 ],
-					"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
-					"vertices": [ -13.22, 5.57, -8, -2.48, -5.49, -14.28, -0.64, -14.36, 4.79, -14.46, 15.28, -2.59, 22.22, 6.12, 22.93, 14.06, 3.75, 9.45, -13.08, 13.72, 4.22, -2.59, 4.04, 2.06 ],
-					"hull": 10,
-					"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+					"uvs": [ 0.51801, 0.12578, 1, 0.16286, 0.99789, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42793, 0.17601, 0, 0.43568, 0 ],
+					"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
+					"vertices": [ -3.11, 15.43, 10.84, 22.27, 15.5, 14.56, 18.36, -8.96, 9.48, -14.33, -4.59, -14.3, -11.64, -2.64, -14.89, 13.68, -7.76, 18 ],
+					"hull": 9,
+					"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
 					"width": 36,
-					"height": 29
+					"height": 41
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": {
+					"name": "goblin/left-lower-leg",
+					"type": "mesh",
+					"uvs": [ 0.95509, 0.2075, 0.81927, 0.65214, 0.94754, 0.77308, 0.67842, 0.97347, 0.46464, 1, 0.26845, 1, 0.04964, 0.90707, 0.21061, 0.60115, 0.07479, 0.40195, 0.18545, 0, 0.28858, 0 ],
+					"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
+					"vertices": [ -0.2, 6.82, 30.97, 10.96, 37.97, 17.34, 53.88, 12.6, 57.59, 6.32, 59.35, 0.09, 55.05, -8.63, 33, -9.34, 20.8, -17.44, -7.28, -21.57, -8.2, -18.29 ],
+					"hull": 11,
+					"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
+					"width": 33,
+					"height": 70
+				}
+			},
+			"right-foot": {
+				"right-foot": {
+					"name": "goblin/right-foot",
+					"type": "mesh",
+					"uvs": [ 0.40851, 0.00471, 0.59088, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97533, 0.89392, 0.90386, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65985, 0, 0.46578, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71258, 0.71501, 0.74681 ],
+					"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
+					"vertices": [ 17.36, 26, 29.14, 15.44, 39.89, 10.81, 48.15, 7.25, 53.84, -2.38, 49.43, -6, 34.85, -6.39, 16.84, -6.87, -2.4, -7.38, -7.59, -3.87, -7.79, 3.7, -7.96, 10.1, -2.57, 22.36, 10.84, 25.98, 22.15, 2.76, 37.32, 2.03 ],
+					"hull": 14,
+					"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
+					"width": 63,
+					"height": 33
 				}
 			}
 		}
@@ -493,35 +493,23 @@
 	{
 		"name": "goblingirl",
 		"attachments": {
-			"eyes": {
-				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
-			},
-			"head": {
-				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			"right-hand": {
+				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-arm": {
-				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
+			"right-hand-thumb": {
+				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
 			},
-			"left-foot": {
-				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			"undies": {
+				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
 			},
-			"left-hand": {
-				"left-hand": {
-					"name": "goblingirl/left-hand",
-					"x": 4.34,
-					"y": 2.39,
-					"scaleX": 0.8965,
-					"scaleY": 0.8965,
-					"rotation": 30.35,
-					"width": 35,
-					"height": 40
-				}
+			"right-lower-leg": {
+				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
 			},
-			"left-lower-leg": {
-				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
+			"left-arm": {
+				"left-arm": { "name": "goblingirl/left-arm", "x": 19.64, "y": -2.43, "rotation": 33.05, "width": 37, "height": 35 }
 			},
-			"left-shoulder": {
-				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			"undie-straps": {
+				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
 			},
 			"left-upper-leg": {
 				"left-upper-leg": { "name": "goblingirl/left-upper-leg", "x": 30.22, "y": -2.95, "rotation": 89.1, "width": 33, "height": 70 }
@@ -529,24 +517,21 @@
 			"neck": {
 				"neck": { "name": "goblingirl/neck", "x": 6.16, "y": -3.15, "rotation": -98.86, "width": 35, "height": 41 }
 			},
+			"head": {
+				"head": { "name": "goblingirl/head", "x": 27.72, "y": -4.32, "rotation": -85.58, "width": 103, "height": 81 }
+			},
+			"eyes": {
+				"eyes-closed": { "name": "goblingirl/eyes-closed", "x": 28, "y": -25.55, "rotation": -87.05, "width": 37, "height": 21 }
+			},
+			"left-shoulder": {
+				"left-shoulder": { "name": "goblingirl/left-shoulder", "x": 19.81, "y": -0.43, "rotation": 61.22, "width": 28, "height": 46 }
+			},
 			"pelvis": {
 				"pelvis": { "name": "goblingirl/pelvis", "x": -3.88, "y": 3.19, "width": 62, "height": 43 }
 			},
 			"right-arm": {
 				"right-arm": { "name": "goblingirl/right-arm", "x": 16.85, "y": -0.66, "rotation": 93.53, "width": 28, "height": 50 }
 			},
-			"right-foot": {
-				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
-			},
-			"right-hand": {
-				"right-hand": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-hand-thumb": {
-				"right-hand-thumb": { "name": "goblingirl/right-hand", "x": 7.22, "y": 3.44, "rotation": 91.17, "width": 36, "height": 37 }
-			},
-			"right-lower-leg": {
-				"right-lower-leg": { "name": "goblingirl/right-lower-leg", "x": 26.15, "y": -3.28, "rotation": 111.84, "width": 36, "height": 76 }
-			},
 			"right-shoulder": {
 				"right-shoulder": { "name": "goblingirl/right-shoulder", "x": 14.46, "y": 0.46, "rotation": 129.85, "width": 39, "height": 45 }
 			},
@@ -556,11 +541,26 @@
 			"torso": {
 				"torso": { "name": "goblingirl/torso", "x": 36.28, "y": -5.14, "rotation": -95.75, "width": 68, "height": 96 }
 			},
-			"undie-straps": {
-				"undie-straps": { "name": "goblingirl/undie-straps", "x": -1.52, "y": 14.19, "width": 55, "height": 19 }
+			"left-foot": {
+				"left-foot": { "name": "goblingirl/left-foot", "type": "linkedmesh", "skin": "goblin", "parent": "left-foot", "width": 65, "height": 31 }
+			},
+			"left-hand": {
+				"left-hand": {
+					"name": "goblingirl/left-hand",
+					"x": 4.34,
+					"y": 2.39,
+					"scaleX": 0.8965,
+					"scaleY": 0.8965,
+					"rotation": 30.35,
+					"width": 35,
+					"height": 40
+				}
+			},
+			"left-lower-leg": {
+				"left-lower-leg": { "name": "goblingirl/left-lower-leg", "x": 25.02, "y": -0.61, "rotation": 105.76, "width": 33, "height": 70 }
 			},
-			"undies": {
-				"undies": { "name": "goblingirl/undies", "x": 5.4, "y": 1.71, "width": 36, "height": 29 }
+			"right-foot": {
+				"right-foot": { "name": "goblingirl/right-foot", "type": "linkedmesh", "skin": "goblin", "parent": "right-foot", "width": 63, "height": 33 }
 			}
 		}
 	}
@@ -828,6 +828,41 @@
 				}
 			},
 			"goblin": {
+				"undies": {
+					"undies": [
+						{
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						},
+						{
+							"time": 0.1333,
+							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+						},
+						{
+							"time": 0.3333,
+							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
+						},
+						{
+							"time": 0.5333,
+							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+						},
+						{
+							"time": 0.7,
+							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
+						},
+						{
+							"time": 0.8333,
+							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+						},
+						{
+							"time": 0.8667,
+							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+						},
+						{
+							"time": 1,
+							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+						}
+					]
+				},
 				"head": {
 					"head": [
 						{ "curve": 0.633, "c3": 0.75 },
@@ -858,68 +893,20 @@
 						{ "time": 1 }
 					]
 				},
-				"left-foot": {
-					"left-foot": [
-						{
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
-						},
-						{ "time": 0.1333 },
-						{
-							"time": 0.2333,
-							"offset": 8,
-							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
-						},
-						{
-							"time": 0.3667,
-							"offset": 8,
-							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
-						},
-						{ "time": 0.5, "curve": "stepped" },
-						{ "time": 0.6333 },
-						{
-							"time": 0.7333,
-							"offset": 8,
-							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
-						},
+				"right-hand": {
+					"right-hand": [
 						{
-							"time": 0.8333,
-							"offset": 6,
-							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						},
+						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 8,
-							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
+							"offset": 4,
+							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						}
 					]
 				},
-				"pelvis": {
-					"pelvis": [
-						{},
-						{
-							"time": 0.1333,
-							"offset": 6,
-							"vertices": [ -0.6899, -4.13284 ]
-						},
-						{
-							"time": 0.3333,
-							"offset": 6,
-							"vertices": [ -1.04945, -3.10477 ]
-						},
-						{
-							"time": 0.7,
-							"offset": 6,
-							"vertices": [ -1.4245, -6.30617 ]
-						},
-						{
-							"time": 0.8667,
-							"offset": 6,
-							"vertices": [ -1.13542, -1.79036 ]
-						},
-						{ "time": 1 }
-					]
-				},
 				"right-foot": {
 					"right-foot": [
 						{},
@@ -962,17 +949,41 @@
 						{ "time": 0.8667 }
 					]
 				},
-				"right-hand": {
-					"right-hand": [
+				"torso": {
+					"torso": [
 						{
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
+						},
+						{
+							"time": 0.1333,
+							"offset": 2,
+							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+						},
+						{
+							"time": 0.3,
+							"offset": 2,
+							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+						},
+						{
+							"time": 0.5,
+							"offset": 2,
+							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+						},
+						{
+							"time": 0.6333,
+							"offset": 2,
+							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+						},
+						{
+							"time": 0.8667,
+							"offset": 2,
+							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
 						},
-						{ "time": 0.5 },
 						{
 							"time": 1,
-							"offset": 4,
-							"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
+							"offset": 2,
+							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
 						}
 					]
 				},
@@ -1004,109 +1015,98 @@
 						}
 					]
 				},
-				"torso": {
-					"torso": [
-						{
-							"offset": 2,
-							"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
-						},
+				"left-foot": {
+					"left-foot": [
 						{
-							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 0.35589, 4.10914, 1.66908, 3.51187, -0.62355, 2.47979, 1.1045, 3.49684, -1.09009, 6.08429, 0.35589, 4.10914, 0, 0, 0, 0, 0, 0, 0, 0, 3.01291, 0.15693, 0.35589, 4.10914, -1.11398, 3.7954, 0.35589, 4.10914, 0, 0, -2.96167, 0.55563, -2.20741, 4.40587 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
+						{ "time": 0.1333 },
 						{
-							"time": 0.3,
-							"offset": 2,
-							"vertices": [ 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 0.2884, 3.32948, 6.32601, 0.19387, 7.84315, 1.94837, 7.08587, 3.64119, 4.52343, 4.46961, 0.2884, 3.32948, 0, 0, 0, 0, 0, 0, 0, 0, 4.36416, -1.83876, 0.2884, 3.32948, 4.2925, 3.60194, 0.2884, 3.32948, 0, 0, 3.72601, -0.19338, 0.2884, 3.32948 ]
+							"time": 0.2333,
+							"offset": 8,
+							"vertices": [ -3.96073, -2.34594, -5.80446, -12.47629, -2.2313, -12.99038, 2.02942, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
-							"time": 0.5,
-							"offset": 2,
-							"vertices": [ 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 0.3133, 3.61659, 2.57273, 2.74457, 2.88831, 3.04797, 3.48442, 3.04655, 1.80035, 4.609, 0.3133, 3.61659, 0, 0, 0, 0, 0, 0, 0, 0, 3.53782, -0.82203, 0.3133, 3.61659, 1.80022, 3.63246, 0.3133, 3.61659, 0, 0, 0.62718, 0.33564, -1.22467, 3.79463 ]
+							"time": 0.3667,
+							"offset": 8,
+							"vertices": [ 0.66505, 0.33548, 0.33902, 2.69014, -0.48171, 2.54524, -1.13593, 1.38562, 0, 0, 0, 0, 0, 0, -0.11908, 0.79273 ]
 						},
+						{ "time": 0.5, "curve": "stepped" },
+						{ "time": 0.6333 },
 						{
-							"time": 0.6333,
-							"offset": 2,
-							"vertices": [ 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 0.44398, 5.125, 1.19401, 3.60798, -0.53546, 3.49565, 1.1926, 4.5127, -1.002, 7.10015, 0.44398, 5.125, 0, 0, 0, 0, 0, 0, 0, 0, 3.101, 1.17278, 0.44398, 5.125, -1.02589, 4.81126, 0.44398, 5.125, 0, 0, -2.87358, 1.57149, -2.11931, 5.42173 ]
+							"time": 0.7333,
+							"offset": 8,
+							"vertices": [ -2.97738, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72607, 6.30799, 0, 0, -1.48902, 4.88944, -7.06773, 10.70102 ]
 						},
 						{
-							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.30385, 3.50647, 0.92587, 2.24385, 0.68874, 1.29945, 3.55433, 3.00604, 2.71494, 5.89962, 0.30385, 3.50647, 0, 0, 0, 0, 0, 0, 0, 0, 1.96775, 0.40548, 0.30385, 3.50647, 2.6104, 2.3545, 0.30385, 3.50647, 0, 0, 0.22709, -0.12851, -0.62826, 3.61437 ]
+							"time": 0.8333,
+							"offset": 6,
+							"vertices": [ 1.05319, 1.56362, -2.52723, 7.9974, -5.52031, 17.14137, -8.93317, 15.79635, -10.73748, 10.22056, -4.23801, 5.36992, 0, 0, 0, 0, -5.83148, 8.55532 ]
 						},
 						{
 							"time": 1,
-							"offset": 2,
-							"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
+							"offset": 8,
+							"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
-				"undie-straps": {
-					"undie-straps": [
-						{
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
-						},
+				"pelvis": {
+					"pelvis": [
+						{},
 						{
 							"time": 0.1333,
-							"offset": 2,
-							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
+							"offset": 6,
+							"vertices": [ -0.6899, -4.13284 ]
 						},
 						{
 							"time": 0.3333,
-							"offset": 2,
-							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
+							"offset": 6,
+							"vertices": [ -1.04945, -3.10477 ]
 						},
 						{
 							"time": 0.7,
-							"offset": 2,
-							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.4245, -6.30617 ]
 						},
 						{
 							"time": 0.8667,
-							"offset": 2,
-							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
+							"offset": 6,
+							"vertices": [ -1.13542, -1.79036 ]
 						},
-						{
-							"time": 1,
-							"offset": 2,
-							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
-						}
+						{ "time": 1 }
 					]
 				},
-				"undies": {
-					"undies": [
+				"undie-straps": {
+					"undie-straps": [
 						{
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72659, 0.4332, 7.20417, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99862, -2.95085, -1.37543, -3.07404, 1.37759, 0, 0.35279, -0.2928, 2.99219, -0.0702, 3.90478, -0.1404 ]
+							"offset": 2,
+							"vertices": [ -2.25684, -1.03177, -1.49719, -4.23862, -0.7447, -2.84907, -1.90072, 0.54478 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16999, 0, 2.10599, -0.23401, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
-						},
-						{
-							"time": 0.5333,
-							"vertices": [ 1.16999, 0, -0.234, -0.936, -2.92499, 0.351, 0, 0, 0, 0, 0.5, -0.24999, -0.64079, -2.07915, -0.64079, -2.07915 ]
+							"offset": 2,
+							"vertices": [ -2.37974, -0.05432, -0.49433, 0.19437, -0.90861, 1.16519, -1.60956, 2.70799, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86271, -0.11514, 4.66327, -0.091, -1.76428, 0.21171, 0, 0, -0.56833, 0.32833, -1.13833, -1.15111, -2.19996, -3.47068, -1.29719, -3.47068, 0, 0, 0, 0, 1.58785, -0.04643, 2.65942, 0.16715 ]
-						},
-						{
-							"time": 0.8333,
-							"vertices": [ 2.41688, -0.20726, 8.58108, 0.585, -0.83571, 0.10029, 0, 0, -1.02299, 0.59099, -2.449, -1.872, -1.625, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08357, 4.78695, 0.30086 ]
+							"offset": 2,
+							"vertices": [ -0.91715, -2.76567, -0.62215, -3.63489, -0.84941, -2.26772, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 0.8667,
-							"vertices": [ 2.0197, -0.02141, 8.98546, 0.4446, -0.20937, 0.08023, 0.4592, 0, -0.3592, 0.47279, -1.8416, -1.4488, -0.79153, 1.26421, 0.53286, 1.23981, 0.4592, 0, 0.1176, -0.0976, 3.2839, -0.09025, 5.13116, 0.19389 ]
+							"offset": 2,
+							"vertices": [ -2.56077, 0.52971, -1.58065, 0.32031, -1.3847, 0.32476, -2.56077, 0.52971 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
+							"offset": 2,
+							"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
 						}
 					]
 				}

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel


Fișier diff suprimat deoarece este prea mare
+ 129 - 135
spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff