瀏覽代碼

Updated example exports, fixed up example projects with mix-and-match skin api demo.

badlogic 6 年之前
父節點
當前提交
f8f495524e
共有 100 個文件被更改,包括 213 次插入168 次删除
  1. 1 1
      examples/alien/export/alien-ess.json
  2. 二進制
      examples/alien/export/alien-ess.skel
  3. 1 1
      examples/alien/export/alien-pro.json
  4. 二進制
      examples/alien/export/alien-pro.skel
  5. 1 1
      examples/coin/export/coin-pro.json
  6. 二進制
      examples/coin/export/coin-pro.skel
  7. 1 1
      examples/dragon/export/dragon-ess.json
  8. 二進制
      examples/dragon/export/dragon-ess.skel
  9. 1 1
      examples/goblins/export/goblins-ess.json
  10. 二進制
      examples/goblins/export/goblins-ess.skel
  11. 1 1
      examples/goblins/export/goblins-pro.json
  12. 二進制
      examples/goblins/export/goblins-pro.skel
  13. 1 1
      examples/hero/export/hero-ess.json
  14. 二進制
      examples/hero/export/hero-ess.skel
  15. 1 1
      examples/hero/export/hero-pro.json
  16. 二進制
      examples/hero/export/hero-pro.skel
  17. 28 19
      examples/mix-and-match/export/mix-and-match-pro.json
  18. 二進制
      examples/mix-and-match/export/mix-and-match-pro.skel
  19. 二進制
      examples/mix-and-match/mix-and-match-pro.spine
  20. 1 1
      examples/owl/export/owl-pro.json
  21. 二進制
      examples/owl/export/owl-pro.skel
  22. 1 1
      examples/powerup/export/powerup-ess.json
  23. 二進制
      examples/powerup/export/powerup-ess.skel
  24. 1 1
      examples/powerup/export/powerup-pro.json
  25. 二進制
      examples/powerup/export/powerup-pro.skel
  26. 1 1
      examples/raptor/export/raptor-pro.json
  27. 二進制
      examples/raptor/export/raptor-pro.skel
  28. 1 1
      examples/speedy/export/speedy-ess.json
  29. 二進制
      examples/speedy/export/speedy-ess.skel
  30. 1 1
      examples/spineboy/export/spineboy-ess.json
  31. 二進制
      examples/spineboy/export/spineboy-ess.skel
  32. 1 1
      examples/spineboy/export/spineboy-pro.json
  33. 二進制
      examples/spineboy/export/spineboy-pro.skel
  34. 1 1
      examples/spinosaurus/export/spinosaurus-ess.json
  35. 二進制
      examples/spinosaurus/export/spinosaurus-ess.skel
  36. 1 1
      examples/stretchyman/export/stretchyman-pro.json
  37. 二進制
      examples/stretchyman/export/stretchyman-pro.skel
  38. 1 1
      examples/stretchyman/export/stretchyman-stretchy-ik-pro.json
  39. 二進制
      examples/stretchyman/export/stretchyman-stretchy-ik-pro.skel
  40. 1 1
      examples/tank/export/tank-pro.json
  41. 二進制
      examples/tank/export/tank-pro.skel
  42. 1 1
      examples/vine/export/vine-pro.json
  43. 二進制
      examples/vine/export/vine-pro.skel
  44. 1 1
      examples/windmill/export/windmill-ess.json
  45. 二進制
      examples/windmill/export/windmill-ess.skel
  46. 1 1
      spine-as3/spine-as3-example/src/spineboy-ess.json
  47. 1 1
      spine-cocos2d-objc/Resources/coin-pro.json
  48. 1 1
      spine-cocos2d-objc/Resources/goblins-pro.json
  49. 1 1
      spine-cocos2d-objc/Resources/raptor-pro.json
  50. 1 1
      spine-cocos2d-objc/Resources/spineboy-ess.json
  51. 1 1
      spine-cocos2d-objc/Resources/tank-pro.json
  52. 二進制
      spine-cocos2dx/example/Resources/common/coin-pro.skel
  53. 1 1
      spine-cocos2dx/example/Resources/common/goblins-pro.json
  54. 二進制
      spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel
  55. 1 1
      spine-cocos2dx/example/Resources/common/raptor-pro.json
  56. 1 1
      spine-cocos2dx/example/Resources/common/spineboy-pro.json
  57. 二進制
      spine-cocos2dx/example/Resources/common/tank-pro.skel
  58. 1 1
      spine-corona/data/coin-pro.json
  59. 1 1
      spine-corona/data/goblins-pro.json
  60. 28 19
      spine-corona/data/mix-and-match-pro.json
  61. 1 1
      spine-corona/data/owl-pro.json
  62. 1 1
      spine-corona/data/raptor-pro.json
  63. 1 1
      spine-corona/data/spineboy-pro.json
  64. 1 1
      spine-corona/data/stretchyman-pro.json
  65. 1 1
      spine-corona/data/stretchyman-stretchy-ik-pro.json
  66. 1 1
      spine-corona/data/tank-pro.json
  67. 1 1
      spine-corona/data/vine-pro.json
  68. 1 1
      spine-corona/main.lua
  69. 1 1
      spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json
  70. 二進制
      spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel
  71. 1 1
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json
  72. 二進制
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel
  73. 1 1
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json
  74. 二進制
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel
  75. 28 19
      spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json
  76. 二進制
      spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel
  77. 1 1
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json
  78. 二進制
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel
  79. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json
  80. 二進制
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel
  81. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json
  82. 二進制
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel
  83. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SkinBonesMixAndMatchTest.java
  84. 1 1
      spine-love/data/coin-pro.json
  85. 1 1
      spine-love/data/goblins-pro.json
  86. 28 19
      spine-love/data/mix-and-match-pro.json
  87. 1 1
      spine-love/data/raptor-pro.json
  88. 1 1
      spine-love/data/spineboy-pro.json
  89. 1 1
      spine-love/data/stretchyman-pro.json
  90. 1 1
      spine-love/data/stretchyman-stretchy-ik-pro.json
  91. 1 1
      spine-love/data/tank-pro.json
  92. 1 1
      spine-love/data/vine-pro.json
  93. 1 1
      spine-love/main.lua
  94. 15 15
      spine-monogame/example/ExampleGame.cs
  95. 1 1
      spine-sfml/c/data/coin-pro.json
  96. 二進制
      spine-sfml/c/data/coin-pro.skel
  97. 1 1
      spine-sfml/c/data/goblins-pro.json
  98. 二進制
      spine-sfml/c/data/goblins-pro.skel
  99. 28 19
      spine-sfml/c/data/mix-and-match-pro.json
  100. 二進制
      spine-sfml/c/data/mix-and-match-pro.skel

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "Q8KgLY4VbdBYvPyGuiNq2Y2RInk",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 365.79,

二進制
examples/alien/export/alien-ess.skel


+ 1 - 1
examples/alien/export/alien-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "wvUSuckBO4KU4hUrc9le/ZCPCWQ",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 368.26,

二進制
examples/alien/export/alien-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

二進制
examples/coin/export/coin-pro.skel


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

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

二進制
examples/dragon/export/dragon-ess.skel


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

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

二進制
examples/goblins/export/goblins-ess.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

二進制
examples/goblins/export/goblins-pro.skel


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

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

二進制
examples/hero/export/hero-ess.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "WmvGzHP0HvIvCzR8koXM95V8sGA",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -87.3,
 	"y": -0.03,
 	"width": 318.76,

二進制
examples/hero/export/hero-pro.skel


File diff suppressed because it is too large
+ 28 - 19
examples/mix-and-match/export/mix-and-match-pro.json


二進制
examples/mix-and-match/export/mix-and-match-pro.skel


二進制
examples/mix-and-match/mix-and-match-pro.spine


+ 1 - 1
examples/owl/export/owl-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "+5xxYvU/cGzeUQ3j0PmfS1ije1k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -644,
 	"y": -274,
 	"width": 1350.84,

二進制
examples/owl/export/owl-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "Quhn+SfWH75rBRTkNhwo0eKqdj4",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -207.3,
 	"y": 119.41,
 	"width": 413.19,

二進制
examples/powerup/export/powerup-ess.skel


+ 1 - 1
examples/powerup/export/powerup-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "OBJqovV4PU/PMuqzgJyP5fosbAs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -208.76,
 	"y": 119.41,
 	"width": 414.65,

二進制
examples/powerup/export/powerup-pro.skel


+ 1 - 1
examples/raptor/export/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

二進制
examples/raptor/export/raptor-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "gLtfCboTLKcJPKYtT0pyDxr7Uag",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -95.43,
 	"y": -18.79,
 	"width": 196.03,

二進制
examples/speedy/export/speedy-ess.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

二進制
examples/spineboy/export/spineboy-ess.skel


+ 1 - 1
examples/spineboy/export/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "0355W9T8wz4vnmE1pY7xcX6qt4Q",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -190.66,
 	"y": -8,
 	"width": 419.84,

二進制
examples/spineboy/export/spineboy-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "1qTCYNGncKp5Ol1mAdGTsq6OHaM",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -840,
 	"y": -766.03,
 	"width": 1680,

二進制
examples/spinosaurus/export/spinosaurus-ess.skel


+ 1 - 1
examples/stretchyman/export/stretchyman-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "skwWQCAt2YYqiSvlFgNvWFDycQE",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.34,
 	"y": -9.21,
 	"width": 264.5,

二進制
examples/stretchyman/export/stretchyman-pro.skel


+ 1 - 1
examples/stretchyman/export/stretchyman-stretchy-ik-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "aVjYz0Nh27E88CSvnWQe0fAmCzs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.36,
 	"y": -9.22,
 	"width": 264.51,

二進制
examples/stretchyman/export/stretchyman-stretchy-ik-pro.skel


+ 1 - 1
examples/tank/export/tank-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "oOfMwoQhaoM02fTRvh6lCzbCkXc",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,

二進制
examples/tank/export/tank-pro.skel


+ 1 - 1
examples/vine/export/vine-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "a2UAVQm4FwEnGn5EwRRJYmJ8SGs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -87.7,
 	"y": -1.71,
 	"width": 227.65,

二進制
examples/vine/export/vine-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "EDDsCFWDtfzYhN5bN1U0TwIrroQ",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -564.6,
 	"y": -335.4,
 	"width": 1124.2,

二進制
examples/windmill/export/windmill-ess.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

+ 1 - 1
spine-cocos2d-objc/Resources/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

+ 1 - 1
spine-cocos2d-objc/Resources/tank-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "oOfMwoQhaoM02fTRvh6lCzbCkXc",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,

二進制
spine-cocos2dx/example/Resources/common/coin-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

二進制
spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel


+ 1 - 1
spine-cocos2dx/example/Resources/common/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

+ 1 - 1
spine-cocos2dx/example/Resources/common/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "0355W9T8wz4vnmE1pY7xcX6qt4Q",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -190.66,
 	"y": -8,
 	"width": 419.84,

二進制
spine-cocos2dx/example/Resources/common/tank-pro.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

File diff suppressed because it is too large
+ 28 - 19
spine-corona/data/mix-and-match-pro.json


+ 1 - 1
spine-corona/data/owl-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "+5xxYvU/cGzeUQ3j0PmfS1ije1k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -644,
 	"y": -274,
 	"width": 1350.84,

+ 1 - 1
spine-corona/data/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

+ 1 - 1
spine-corona/data/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "0355W9T8wz4vnmE1pY7xcX6qt4Q",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -190.66,
 	"y": -8,
 	"width": 419.84,

+ 1 - 1
spine-corona/data/stretchyman-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "skwWQCAt2YYqiSvlFgNvWFDycQE",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.34,
 	"y": -9.21,
 	"width": 264.5,

+ 1 - 1
spine-corona/data/stretchyman-stretchy-ik-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "aVjYz0Nh27E88CSvnWQe0fAmCzs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.36,
 	"y": -9.22,
 	"width": 264.51,

+ 1 - 1
spine-corona/data/tank-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "oOfMwoQhaoM02fTRvh6lCzbCkXc",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,

+ 1 - 1
spine-corona/data/vine-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "a2UAVQm4FwEnGn5EwRRJYmJ8SGs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -87.7,
 	"y": -1.71,
 	"width": 227.65,

+ 1 - 1
spine-corona/main.lua

@@ -110,7 +110,7 @@ function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin)
     local skin = spine.Skin.new("mix-and-match")
     skin:addSkin(skeletonData:findSkin("skin-base"))
     skin:addSkin(skeletonData:findSkin("nose/short"))
-    skin:addSkin(skeletonData:findSkin("eyes/eyelids-girly"))
+    skin:addSkin(skeletonData:findSkin("eyelids/girly"))
     skin:addSkin(skeletonData:findSkin("eyes/violet"))
     skin:addSkin(skeletonData:findSkin("hair/brown"))
     skin:addSkin(skeletonData:findSkin("clothes/hoodie-orange"))

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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

二進制
spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel


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

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

二進制
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel


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

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

二進制
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel


File diff suppressed because it is too large
+ 28 - 19
spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json


二進制
spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel


+ 1 - 1
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

二進制
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel


+ 1 - 1
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "AUQx/betarHq9lEIe4JRkbTm95k",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

二進制
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel


+ 1 - 1
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "0355W9T8wz4vnmE1pY7xcX6qt4Q",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -190.66,
 	"y": -8,
 	"width": 419.84,

二進制
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel


+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SkinBonesMixAndMatchTest.java

@@ -49,7 +49,7 @@ public class SkinBonesMixAndMatchTest extends ApplicationAdapter {
 		Skin mixAndMatchSkin = new Skin("custom-girl");
 		mixAndMatchSkin.addSkin(skeletonData.findSkin("skin-base"));
 		mixAndMatchSkin.addSkin(skeletonData.findSkin("nose/short"));
-		mixAndMatchSkin.addSkin(skeletonData.findSkin("eyes/eyelids-girly"));
+		mixAndMatchSkin.addSkin(skeletonData.findSkin("eyelids/girly"));
 		mixAndMatchSkin.addSkin(skeletonData.findSkin("eyes/violet"));
 		mixAndMatchSkin.addSkin(skeletonData.findSkin("hair/brown"));
 		mixAndMatchSkin.addSkin(skeletonData.findSkin("clothes/hoodie-orange"));

+ 1 - 1
spine-love/data/coin-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

+ 1 - 1
spine-love/data/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

File diff suppressed because it is too large
+ 28 - 19
spine-love/data/mix-and-match-pro.json


+ 1 - 1
spine-love/data/raptor-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "rYEZOV6gFdeLa8p5iWLDxr3Qgfs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1280.26,

+ 1 - 1
spine-love/data/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "0355W9T8wz4vnmE1pY7xcX6qt4Q",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -190.66,
 	"y": -8,
 	"width": 419.84,

+ 1 - 1
spine-love/data/stretchyman-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "skwWQCAt2YYqiSvlFgNvWFDycQE",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.34,
 	"y": -9.21,
 	"width": 264.5,

+ 1 - 1
spine-love/data/stretchyman-stretchy-ik-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "aVjYz0Nh27E88CSvnWQe0fAmCzs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -104.36,
 	"y": -9.22,
 	"width": 264.51,

+ 1 - 1
spine-love/data/tank-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "oOfMwoQhaoM02fTRvh6lCzbCkXc",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,

+ 1 - 1
spine-love/data/vine-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "a2UAVQm4FwEnGn5EwRRJYmJ8SGs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -87.7,
 	"y": -1.71,
 	"width": 227.65,

+ 1 - 1
spine-love/main.lua

@@ -74,7 +74,7 @@ function loadSkeleton (jsonFile, atlasFile, animation, skin, scale, x, y)
     local skin = spine.Skin.new("mix-and-match")
     skin:addSkin(skeletonData:findSkin("skin-base"))
     skin:addSkin(skeletonData:findSkin("nose/short"))
-    skin:addSkin(skeletonData:findSkin("eyes/eyelids-girly"))
+    skin:addSkin(skeletonData:findSkin("eyelids/girly"))
     skin:addSkin(skeletonData:findSkin("eyes/violet"))
     skin:addSkin(skeletonData:findSkin("hair/brown"))
     skin:addSkin(skeletonData:findSkin("clothes/hoodie-orange"))

+ 15 - 15
spine-monogame/example/ExampleGame.cs

@@ -43,7 +43,7 @@ namespace Spine {
 		public Screen(Example game) {
 			this.game = game;
 			skeletonRenderer = new SkeletonRenderer(game.GraphicsDevice);
-			skeletonRenderer.PremultipliedAlpha = false;			
+			skeletonRenderer.PremultipliedAlpha = false;
 		}
 
 		public void UpdateInput() {
@@ -63,7 +63,7 @@ namespace Spine {
 		Skeleton skeleton;
 		AnimationState state;
 
-		public RaptorScreen(Example game) : base (game) {		
+		public RaptorScreen(Example game) : base (game) {
 			// Load the texture atlas
 			atlas = new Atlas("data/raptor.atlas", new XnaTextureLoader(game.GraphicsDevice));
 
@@ -82,7 +82,7 @@ namespace Spine {
 			skeleton.Y = game.GraphicsDevice.Viewport.Height;
 
 			// Set the "walk" animation on track one and let it loop forever
-			state.SetAnimation(0, "walk", true);			
+			state.SetAnimation(0, "walk", true);
 		}
 
 		public override void Render(float deltaTime) {
@@ -97,7 +97,7 @@ namespace Spine {
 			// Clear the screen and setup the projection matrix of the skeleton renderer
 			game.GraphicsDevice.Clear(Color.Black);
 			((BasicEffect)skeletonRenderer.Effect).Projection = Matrix.CreateOrthographicOffCenter(0, game.GraphicsDevice.Viewport.Width, game.GraphicsDevice.Viewport.Height, 0, 1, 0);
-			
+
 			// Draw the skeletons
 			skeletonRenderer.Begin();
 			skeletonRenderer.Draw(skeleton);
@@ -125,7 +125,7 @@ namespace Spine {
 			skeletonRenderer.Effect = twoColorTintEffect;
 
 			// The remaining code loads the atlas and skeleton data as in the raptor screen
-			atlas = new Atlas("data/tank.atlas", new XnaTextureLoader(game.GraphicsDevice));			
+			atlas = new Atlas("data/tank.atlas", new XnaTextureLoader(game.GraphicsDevice));
 			SkeletonJson json = new SkeletonJson(atlas);
 			json.Scale = 0.25f;
 			SkeletonData skeletonData = json.ReadSkeletonData("data/tank-pro.json");
@@ -154,14 +154,14 @@ namespace Spine {
 			skeletonRenderer.Begin();
 			skeletonRenderer.Draw(skeleton);
 			skeletonRenderer.End();
-			
+
 			if (mouseClicked) game.currentScreen = new SpineboyScreen(game);
 		}
 	}
 
 	/// <summary>
 	/// The Spineboy screen shows how to queue up multiple animations via animation state,
-	/// set the default mix time to smoothly transition between animations, and load a 
+	/// set the default mix time to smoothly transition between animations, and load a
 	/// skeleton from a binary .skel file.
 	/// </summary>
 	internal class SpineboyScreen : Screen {
@@ -169,7 +169,7 @@ namespace Spine {
 		Skeleton skeleton;
 		AnimationState state;
 
-		public SpineboyScreen(Example game) : base(game) {			
+		public SpineboyScreen(Example game) : base(game) {
 			atlas = new Atlas("data/spineboy.atlas", new XnaTextureLoader(game.GraphicsDevice));
 
 			SkeletonBinary binary = new SkeletonBinary(atlas);
@@ -177,7 +177,7 @@ namespace Spine {
 			SkeletonData skeletonData = binary.ReadSkeletonData("data/spineboy-pro.skel");
 
 			skeleton = new Skeleton(skeletonData);
-			AnimationStateData stateData = new AnimationStateData(skeleton.Data);			
+			AnimationStateData stateData = new AnimationStateData(skeleton.Data);
 			state = new AnimationState(stateData);
 
 			skeleton.X = game.GraphicsDevice.Viewport.Width / 2;
@@ -201,14 +201,14 @@ namespace Spine {
 			state.Update(deltaTime);
 			state.Apply(skeleton);
 			skeleton.UpdateWorldTransform();
-			
+
 			game.GraphicsDevice.Clear(Color.Black);
 			((BasicEffect)skeletonRenderer.Effect).Projection = Matrix.CreateOrthographicOffCenter(0, game.GraphicsDevice.Viewport.Width, game.GraphicsDevice.Viewport.Height, 0, 1, 0);
-			
+
 			skeletonRenderer.Begin();
 			skeletonRenderer.Draw(skeleton);
 			skeletonRenderer.End();
-			
+
 			if (mouseClicked) game.currentScreen = new MixAndMatchScreen(game);
 		}
 	}
@@ -236,7 +236,7 @@ namespace Spine {
 
 			skeleton.X = game.GraphicsDevice.Viewport.Width / 2;
 			skeleton.Y = game.GraphicsDevice.Viewport.Height;
-			
+
 			state.SetAnimation(0, "dance", true);
 
 			// Create a new skin, by mixing and matching other skins
@@ -246,7 +246,7 @@ namespace Spine {
 			var mixAndMatchSkin = new Spine.Skin("custom-girl");
 			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("skin-base"));
 			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("nose/short"));
-			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("eyes/eyelids-girly"));
+			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("eyelids/girly"));
 			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("eyes/violet"));
 			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("hair/brown"));
 			mixAndMatchSkin.AddSkin(skeletonData.FindSkin("clothes/hoodie-orange"));
@@ -295,6 +295,6 @@ namespace Spine {
 
 		protected override void Draw(GameTime gameTime) {
 			currentScreen.Render(gameTime.ElapsedGameTime.Milliseconds / 1000.0f);
-		}		
+		}
 	}
 }

+ 1 - 1
spine-sfml/c/data/coin-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UAXc6AgX0g45vxO38bHIVx5jbNo",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

二進制
spine-sfml/c/data/coin-pro.skel


+ 1 - 1
spine-sfml/c/data/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "RUppHNl8+HjH0JGhZt+lyKfNXxs",
-	"spine": "3.8.26-beta",
+	"spine": "3.8.33-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

二進制
spine-sfml/c/data/goblins-pro.skel


File diff suppressed because it is too large
+ 28 - 19
spine-sfml/c/data/mix-and-match-pro.json


二進制
spine-sfml/c/data/mix-and-match-pro.skel


Some files were not shown because too many files changed in this diff