Ver código fonte

[starling] Fixed renderer, ignores path attachments. Fixed samples, click on sprites to advance to next sample. Updated assets

badlogic 8 anos atrás
pai
commit
8920840ecf
100 arquivos alterados com 162 adições e 94 exclusões
  1. 1 1
      examples/alien/export/alien.json
  2. BIN
      examples/alien/export/alien.skel
  3. 1 1
      examples/dragon/export/dragon.json
  4. BIN
      examples/dragon/export/dragon.skel
  5. 6 5
      examples/export/export.sh
  6. 4 8
      examples/export/runtimes.sh
  7. 1 1
      examples/goblins/export/goblins-mesh.json
  8. BIN
      examples/goblins/export/goblins-mesh.skel
  9. 1 1
      examples/goblins/export/goblins.json
  10. BIN
      examples/goblins/export/goblins.skel
  11. 1 1
      examples/hero/export/hero-mesh.json
  12. BIN
      examples/hero/export/hero-mesh.skel
  13. 1 1
      examples/hero/export/hero.json
  14. BIN
      examples/hero/export/hero.skel
  15. 1 1
      examples/powerup/export/powerup.json
  16. BIN
      examples/powerup/export/powerup.skel
  17. 1 1
      examples/raptor/export/raptor.json
  18. BIN
      examples/raptor/export/raptor.skel
  19. 1 1
      examples/speedy/export/speedy.json
  20. BIN
      examples/speedy/export/speedy.skel
  21. 1 1
      examples/spineboy-old/export/spineboy-old.json
  22. BIN
      examples/spineboy-old/export/spineboy-old.skel
  23. 1 1
      examples/spineboy/export/spineboy-hover.json
  24. BIN
      examples/spineboy/export/spineboy-hover.skel
  25. 1 1
      examples/spineboy/export/spineboy-mesh.json
  26. BIN
      examples/spineboy/export/spineboy-mesh.skel
  27. 1 1
      examples/spineboy/export/spineboy.json
  28. BIN
      examples/spineboy/export/spineboy.skel
  29. 1 1
      examples/spinosaurus/export/spinosaurus.json
  30. BIN
      examples/spinosaurus/export/spinosaurus.skel
  31. 1 1
      examples/stretchyman/export/stretchyman.json
  32. BIN
      examples/stretchyman/export/stretchyman.skel
  33. 1 1
      examples/tank/export/tank.json
  34. BIN
      examples/tank/export/tank.skel
  35. 1 1
      examples/test/export/test.json
  36. BIN
      examples/test/export/test.skel
  37. 1 1
      examples/vine/export/vine.json
  38. BIN
      examples/vine/export/vine.skel
  39. 1 1
      spine-as3/spine-as3-example/src/spineboy.json
  40. 1 1
      spine-cocos2d-objc/Resources/goblins-mesh.json
  41. 1 1
      spine-cocos2d-objc/Resources/raptor.json
  42. 1 1
      spine-cocos2d-objc/Resources/spineboy.json
  43. 1 1
      spine-cocos2d-objc/Resources/tank.json
  44. 1 1
      spine-cocos2dx/example/Resources/common/goblins-mesh.json
  45. 1 1
      spine-cocos2dx/example/Resources/common/raptor.json
  46. 1 1
      spine-cocos2dx/example/Resources/common/spineboy.json
  47. 1 1
      spine-cocos2dx/example/Resources/common/tank.json
  48. 1 1
      spine-corona/data/goblins-mesh.json
  49. 1 1
      spine-corona/data/raptor.json
  50. 1 1
      spine-corona/data/spineboy.json
  51. 1 1
      spine-corona/data/stretchyman.json
  52. 1 1
      spine-corona/data/tank.json
  53. 1 1
      spine-corona/data/test.json
  54. 1 1
      spine-corona/data/vine.json
  55. 1 1
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.json
  56. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.skel
  57. 1 1
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.json
  58. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.skel
  59. 1 1
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.json
  60. BIN
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.skel
  61. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json
  62. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.skel
  63. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-hover.json
  64. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-hover.skel
  65. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-mesh.json
  66. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-mesh.skel
  67. 1 1
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.json
  68. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.skel
  69. 1 1
      spine-love/data/goblins-mesh.json
  70. 1 1
      spine-love/data/raptor.json
  71. 1 1
      spine-love/data/spineboy.json
  72. 1 1
      spine-love/data/stretchyman.json
  73. 1 1
      spine-love/data/tank.json
  74. 1 1
      spine-love/data/test.json
  75. 1 1
      spine-love/data/vine.json
  76. 2 3
      spine-love/main.lua
  77. 1 1
      spine-sfml/data/goblins-mesh.json
  78. BIN
      spine-sfml/data/goblins-mesh.skel
  79. 1 1
      spine-sfml/data/raptor.json
  80. BIN
      spine-sfml/data/raptor.skel
  81. 1 1
      spine-sfml/data/spineboy.json
  82. BIN
      spine-sfml/data/spineboy.skel
  83. 1 1
      spine-sfml/data/stretchyman.json
  84. BIN
      spine-sfml/data/stretchyman.skel
  85. 1 1
      spine-sfml/data/tank.json
  86. BIN
      spine-sfml/data/tank.skel
  87. 1 1
      spine-sfml/data/vine.json
  88. BIN
      spine-sfml/data/vine.skel
  89. BIN
      spine-starling/spine-starling-example/lib/spine-starling.swc
  90. 1 1
      spine-starling/spine-starling-example/src/goblins-mesh.json
  91. 1 1
      spine-starling/spine-starling-example/src/raptor.json
  92. 12 2
      spine-starling/spine-starling-example/src/spine/examples/GoblinsExample.as
  93. 2 11
      spine-starling/spine-starling-example/src/spine/examples/Main.as
  94. 14 5
      spine-starling/spine-starling-example/src/spine/examples/RaptorExample.as
  95. 6 3
      spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as
  96. 15 0
      spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as
  97. 15 0
      spine-starling/spine-starling-example/src/spine/examples/TankExample.as
  98. 14 0
      spine-starling/spine-starling-example/src/spine/examples/TwoColorExample.as
  99. 15 0
      spine-starling/spine-starling-example/src/spine/examples/VineExample.as
  100. 1 1
      spine-starling/spine-starling-example/src/spineboy.json

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "KbedHwMuvIUvCUziYdeAMmLqQdc", "spine": "3.6.12-beta", "width": 365.79, "height": 391.47, "images": "./images/" },
+"skeleton": { "hash": "KbedHwMuvIUvCUziYdeAMmLqQdc", "spine": "3.6.14-beta", "width": 365.79, "height": 391.47, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -8.17, "y": 73.5, "color": "fff200ff" },

BIN
examples/alien/export/alien.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "wKRjA+djIs9K05d/19sZhwmP3Ow", "spine": "3.6.12-beta", "width": 897, "height": 716.36, "images": "./images/" },
+"skeleton": { "hash": "wKRjA+djIs9K05d/19sZhwmP3Ow", "spine": "3.6.14-beta", "width": 897, "height": 716.36, "images": "./images/" },
 "bones": [
 	{ "name": "root", "y": -176.12 },
 	{ "name": "COG", "parent": "root", "y": 176.12 },

BIN
examples/dragon/export/dragon.skel


+ 6 - 5
examples/export/export.sh

@@ -11,6 +11,7 @@ echo "Spine exe: $SPINE_EXE"
 
 echo "Cleaning..."
 rm -rf ../alien/export/*
+rm -rf ../coin/export/*
 rm -rf ../dragon/export/*
 rm -rf ../goblins/export/*
 rm -rf ../hero/export/*
@@ -33,6 +34,11 @@ echo "Exporting..."
 -i ../alien/images -o ../alien/export -n alien -p atlas-0.5.json \
 -i ../alien/images -o ../alien/export -n alien-pma -p atlas-0.5-pma.json \
 \
+-i ../coin/coin-pro.spine -o ../coin/export -e json.json \
+-i ../coin/coin-pro.spine -o ../coin/export -e binary.json \
+-i ../coin/images -o ../coin/export -n coin -p atlas-0.5.json \
+-i ../coin/images -o ../coin/export -n coin-pma -p atlas-0.5-pma.json \
+\
 -i ../dragon/dragon.spine -o ../dragon/export -e json.json \
 -i ../dragon/dragon.spine -o ../dragon/export -e binary.json \
 -i ../dragon/images -o ../dragon/export -n dragon -p atlas-1.0.json \
@@ -94,11 +100,6 @@ echo "Exporting..."
 -i ../tank/images -o ../tank/export -n tank -p atlas-0.5.json \
 -i ../tank/images -o ../tank/export -n tank-pma -p atlas-0.5-pma.json \
 \
--i ../test/test.spine -o ../test/export -e json.json \
--i ../test/test.spine -o ../test/export -e binary.json \
--i ../test/images -o ../test/export -n test -p atlas-0.5.json \
--i ../test/images -o ../test/export -n test-pma -p atlas-0.5-pma.json \
-\
 -i ../vine/vine.spine -o ../vine/export -e json.json \
 -i ../vine/vine.spine -o ../vine/export -e binary.json \
 -i ../vine/images -o ../vine/export -n vine -p atlas-1.0.json \

+ 4 - 8
examples/export/runtimes.sh

@@ -94,10 +94,6 @@ cp -f ../stretchyman/export/stretchyman.json ../../spine-corona/data
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-corona/data
 cp -f ../stretchyman/export/stretchyman.png ../../spine-corona/data
 
-cp -f ../test/export/test.json ../../spine-corona/data
-cp -f ../test/export/test.atlas ../../spine-corona/data
-cp -f ../test/export/test.png ../../spine-corona/data
-
 echo "spine-love"
 rm -f ../../spine-love/data/*
 cp -f ../goblins/export/goblins-mesh.json ../../spine-love/data
@@ -124,10 +120,6 @@ cp -f ../stretchyman/export/stretchyman.json ../../spine-love/data
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-love/data
 cp -f ../stretchyman/export/stretchyman.png ../../spine-love/data
 
-cp -f ../test/export/test.json ../../spine-love/data
-cp -f ../test/export/test.atlas ../../spine-love/data
-cp -f ../test/export/test.png ../../spine-love/data
-
 echo "spine-sfml"
 rm -f ../../spine-sfml/data/*
 cp -f ../goblins/export/goblins-mesh.json ../../spine-sfml/data/
@@ -189,6 +181,10 @@ cp -f ../stretchyman/export/stretchyman.png ../../spine-starling/spine-starling-
 
 echo "spine-ts"
 rm -f ../../spine-ts/webgl/example/assets/*
+cp -f ../coin/export/coin.json ../../spine-ts-webgl/examples/assets/
+cp -f ../coin/export/coin.atlas ../../spine-ts-webgl/examples/assets/
+cp -f ../coin/export/coin.png ../../spine-ts-webgl/examples/assets/
+
 cp -f ../goblins/export/goblins-mesh.json ../../spine-ts/webgl/example/assets/
 cp -f ../goblins/export/goblins.atlas ../../spine-ts/webgl/example/assets/goblins-mesh.atlas
 cp -f ../goblins/export/goblins.png ../../spine-ts/webgl/example/assets/goblins.png

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "r5YD0f6538Hmy0yaaam0Wp73fd8", "spine": "3.6.12-beta", "width": 234.01, "height": 354.84, "images": "./images/" },
+"skeleton": { "hash": "r5YD0f6538Hmy0yaaam0Wp73fd8", "spine": "3.6.14-beta", "width": 234.01, "height": 354.84, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

BIN
examples/goblins/export/goblins.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "ESgSG/7CxdxIbeuHK+6pb0TxzjM", "spine": "3.6.12-beta", "width": 318.71, "height": 333.7, "images": "./images/" },
+"skeleton": { "hash": "ESgSG/7CxdxIbeuHK+6pb0TxzjM", "spine": "3.6.14-beta", "width": 318.71, "height": 333.7, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "Hip", "parent": "root", "y": 94.89 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "5CVEtC6/slh4hSB3vRGoGm7LdKY", "spine": "3.6.12-beta", "width": 319.36, "height": 337.02, "images": "./images/" },
+"skeleton": { "hash": "5CVEtC6/slh4hSB3vRGoGm7LdKY", "spine": "3.6.14-beta", "width": 319.36, "height": 337.02, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "Hip", "parent": "root", "y": 94.89 },

BIN
examples/hero/export/hero.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "d01ShNZ08gDOIyqc2CGlBzHUKrA", "spine": "3.6.12-beta", "width": 413.19, "height": 195.71, "images": "./images/" },
+"skeleton": { "hash": "d01ShNZ08gDOIyqc2CGlBzHUKrA", "spine": "3.6.14-beta", "width": 413.19, "height": 195.71, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "powerup", "parent": "root", "x": 1.48, "y": 134.02 },

BIN
examples/powerup/export/powerup.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

BIN
examples/raptor/export/raptor.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "/NqLa1fxpj/CLuLG6xP3+K+2Oq0", "spine": "3.6.12-beta", "width": 196.03, "height": 305.44, "images": "./images/" },
+"skeleton": { "hash": "/NqLa1fxpj/CLuLG6xP3+K+2Oq0", "spine": "3.6.14-beta", "width": 196.03, "height": 305.44, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -0.03, "y": 51.91 },

BIN
examples/speedy/export/speedy.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "7ZwwnXuU4QeWBoMnt86GJ4+hiN0", "spine": "3.6.12-beta", "width": 161.12, "height": 343.58, "images": "./images/" },
+"skeleton": { "hash": "7ZwwnXuU4QeWBoMnt86GJ4+hiN0", "spine": "3.6.14-beta", "width": 161.12, "height": 343.58, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "jwwArXQBSgnDp4JM5vgHQsr+jXc", "spine": "3.6.12-beta", "width": 511.48, "height": 739.87, "images": "./images/" },
+"skeleton": { "hash": "jwwArXQBSgnDp4JM5vgHQsr+jXc", "spine": "3.6.14-beta", "width": 511.48, "height": 739.87, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -49.9, "y": 290.96 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "Ej63wc50xNQhwqzbg9G0U7ADkFQ", "spine": "3.6.12-beta", "width": 0, "height": 0, "images": "./images/" },
+"skeleton": { "hash": "Ej63wc50xNQhwqzbg9G0U7ADkFQ", "spine": "3.6.14-beta", "width": 0, "height": 0, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "y": 247.27 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

BIN
examples/spineboy/export/spineboy.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "/FQ62MLXDzS93xb3LzhPr1aQxX8", "spine": "3.6.12-beta", "width": 1680, "height": 1782.28, "images": "./images/" },
+"skeleton": { "hash": "/FQ62MLXDzS93xb3LzhPr1aQxX8", "spine": "3.6.14-beta", "width": 1680, "height": 1782.28, "images": "./images/" },
 "bones": [
 	{ "name": "root", "y": -526.32 },
 	{ "name": "leaves", "parent": "root", "x": -0.17, "y": 1310.1 },

BIN
examples/spinosaurus/export/spinosaurus.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.12-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
+"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.14-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 28.61, "y": 289.9 },

BIN
examples/stretchyman/export/stretchyman.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

BIN
examples/tank/export/tank.skel


+ 1 - 1
examples/test/export/test.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.12-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
+"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.14-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
 "bones": [
 	{ "name": "root", "x": 28.68, "y": -105.71 },
 	{ "name": "attachment", "parent": "root", "x": -267.71, "y": -366.62 },

BIN
examples/test/export/test.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.12-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
+"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.14-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "vine1", "parent": "root", "length": 74, "rotation": 90, "x": 339.1, "y": -467.15, "color": "f700ffff" },

BIN
examples/vine/export/vine.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

+ 1 - 1
spine-cocos2dx/example/Resources/common/tank.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.12-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
+"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.14-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 28.61, "y": 289.9 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

+ 1 - 1
spine-corona/data/test.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.12-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
+"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.14-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
 "bones": [
 	{ "name": "root", "x": 28.68, "y": -105.71 },
 	{ "name": "attachment", "parent": "root", "x": -267.71, "y": -366.62 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.12-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
+"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.14-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "vine1", "parent": "root", "length": 74, "rotation": 90, "x": 339.1, "y": -467.15, "color": "f700ffff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "r5YD0f6538Hmy0yaaam0Wp73fd8", "spine": "3.6.12-beta", "width": 234.01, "height": 354.84, "images": "./images/" },
+"skeleton": { "hash": "r5YD0f6538Hmy0yaaam0Wp73fd8", "spine": "3.6.14-beta", "width": 234.01, "height": 354.84, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

BIN
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "7ZwwnXuU4QeWBoMnt86GJ4+hiN0", "spine": "3.6.12-beta", "width": 161.12, "height": 343.58, "images": "./images/" },
+"skeleton": { "hash": "7ZwwnXuU4QeWBoMnt86GJ4+hiN0", "spine": "3.6.14-beta", "width": 161.12, "height": 343.58, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "jwwArXQBSgnDp4JM5vgHQsr+jXc", "spine": "3.6.12-beta", "width": 511.48, "height": 739.87, "images": "./images/" },
+"skeleton": { "hash": "jwwArXQBSgnDp4JM5vgHQsr+jXc", "spine": "3.6.14-beta", "width": 511.48, "height": 739.87, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -49.9, "y": 290.96 },

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-hover.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "Ej63wc50xNQhwqzbg9G0U7ADkFQ", "spine": "3.6.12-beta", "width": 0, "height": 0, "images": "./images/" },
+"skeleton": { "hash": "Ej63wc50xNQhwqzbg9G0U7ADkFQ", "spine": "3.6.14-beta", "width": 0, "height": 0, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "y": 247.27 },

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-mesh.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.skel


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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.12-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
+"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.14-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 28.61, "y": 289.9 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

+ 1 - 1
spine-love/data/test.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.12-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
+"skeleton": { "hash": "64h+ct/Nr1wkBrgZHtYbbfXpBlI", "spine": "3.6.14-beta", "width": 1333.78, "height": 1112.91, "images": "./images/" },
 "bones": [
 	{ "name": "root", "x": 28.68, "y": -105.71 },
 	{ "name": "attachment", "parent": "root", "x": -267.71, "y": -366.62 },

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

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.12-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
+"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.14-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "vine1", "parent": "root", "length": 74, "rotation": 90, "x": 339.1, "y": -467.15, "color": "f700ffff" },

+ 2 - 3
spine-love/main.lua

@@ -88,13 +88,12 @@ end
 
 function love.load(arg)
 	if arg[#arg] == "-debug" then require("mobdebug").start() end
-	-- table.insert(skeletons, loadSkeleton("test", "test", "animation", nil, 0.5, 400, 300))
 	table.insert(skeletons, loadSkeleton("spineboy", "spineboy", "walk", nil, 0.5, 400, 500))
---[[	table.insert(skeletons, loadSkeleton("raptor", "raptor", "walk", nil, 0.3, 400, 500))
+	table.insert(skeletons, loadSkeleton("raptor", "raptor", "walk", nil, 0.3, 400, 500))
 	table.insert(skeletons, loadSkeleton("goblins-mesh", "goblins", "walk", "goblin", 1, 400, 500))
 	table.insert(skeletons, loadSkeleton("tank", "tank", "drive", nil, 0.2, 600, 500))
 	table.insert(skeletons, loadSkeleton("vine", "vine", "animation", nil, 0.3, 400, 500))
-	table.insert(skeletons, loadSkeleton("stretchyman", "stretchyman", "sneak", nil, 0.3, 200, 500))]]--
+	table.insert(skeletons, loadSkeleton("stretchyman", "stretchyman", "sneak", nil, 0.3, 200, 500))
 	skeletonRenderer = spine.SkeletonRenderer.new(true)
 end
 

+ 1 - 1
spine-sfml/data/goblins-mesh.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

BIN
spine-sfml/data/goblins-mesh.skel


+ 1 - 1
spine-sfml/data/raptor.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

BIN
spine-sfml/data/raptor.skel


+ 1 - 1
spine-sfml/data/spineboy.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

BIN
spine-sfml/data/spineboy.skel


+ 1 - 1
spine-sfml/data/stretchyman.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.12-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
+"skeleton": { "hash": "RC7+qra2dmTzDIZaq6KhAjmvQgQ", "spine": "3.6.14-beta", "width": 264.48, "height": 570.11, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 28.61, "y": 289.9 },

BIN
spine-sfml/data/stretchyman.skel


+ 1 - 1
spine-sfml/data/tank.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.12-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
+"skeleton": { "hash": "B1t2zOgaLSulKMcmcm3oTMzI3qI", "spine": "3.6.14-beta", "width": 1914.53, "height": 964.05, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "tankRoot", "parent": "root", "y": 200 },

BIN
spine-sfml/data/tank.skel


+ 1 - 1
spine-sfml/data/vine.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.12-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
+"skeleton": { "hash": "XWcs8pGHgYuqhvjNJQtrj3g2BEs", "spine": "3.6.14-beta", "width": 227.33, "height": 841.07, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "vine1", "parent": "root", "length": 74, "rotation": 90, "x": 339.1, "y": -467.15, "color": "f700ffff" },

BIN
spine-sfml/data/vine.skel


BIN
spine-starling/spine-starling-example/lib/spine-starling.swc


+ 1 - 1
spine-starling/spine-starling-example/src/goblins-mesh.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.12-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
+"skeleton": { "hash": "awYuZphYLRdHB2QK7tysD2unMI0", "spine": "3.6.14-beta", "width": 266.88, "height": 349.56, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 },

+ 1 - 1
spine-starling/spine-starling-example/src/raptor.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.12-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
+"skeleton": { "hash": "WOArBZLexLEX/Tow3AuM8ddszEE", "spine": "3.6.14-beta", "width": 1223.73, "height": 1055.62, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "rotation": 3.16, "x": -136.79, "y": 415.48, "color": "fbff00ff" },

+ 12 - 2
spine-starling/spine-starling-example/src/spine/examples/GoblinsExample.as

@@ -29,6 +29,7 @@
  *****************************************************************************/
  
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
 	import spine.*;
 	import spine.atlas.Atlas;
 	import spine.attachments.AtlasAttachmentLoader;
@@ -61,6 +62,8 @@ package spine.examples {
 		[Embed(source = "/goblins-mesh-starling.png")]
 		static public const GoblinsStarlingAtlasTexture : Class;
 		private var skeleton : SkeletonAnimation;
+		
+		private var skinChangeCount: Number = 0;
 
 		public function GoblinsExample() {
 			var useStarlingAtlas : Boolean = false;
@@ -95,8 +98,15 @@ package spine.examples {
 		private function onClick(event : TouchEvent) : void {
 			var touch : Touch = event.getTouch(this);
 			if (touch && touch.phase == TouchPhase.BEGAN) {
-				skeleton.skeleton.skinName = skeleton.skeleton.skin.name == "goblin" ? "goblingirl" : "goblin";
-				skeleton.skeleton.setSlotsToSetupPose();
+				if (skinChangeCount < 2) {
+					skeleton.skeleton.skinName = skeleton.skeleton.skin.name == "goblin" ? "goblingirl" : "goblin";
+					skeleton.skeleton.setSlotsToSetupPose();
+					skinChangeCount++;
+				} else {					
+					var parent: DisplayObjectContainer = this.parent;
+					this.removeFromParent(true);			
+					parent.addChild(new RaptorExample());	
+				}
 			}
 		}
 	}

+ 2 - 11
spine-starling/spine-starling-example/src/spine/examples/Main.as

@@ -38,20 +38,11 @@ package spine.examples {
 		private var _starling : Starling;
 
 		public function Main() {
-			var example : Class;
-			example = SpineboyExample;
-			// example = GoblinsExample;
-			// example = RaptorExample;
-			// example = TankExample;
-			// example = VineExample;
-			// example = StretchymanExample;
-			// example = TwoColorExample;
-
-			_starling = new Starling(example, stage);
+			_starling = new Starling(SpineboyExample, stage);
 			_starling.enableErrorChecking = true;
 			_starling.showStats = true;
 			_starling.skipUnchangedFrames = false;
-			_starling.start();			
+			_starling.start();	
 		}
 	}
 }

+ 14 - 5
spine-starling/spine-starling-example/src/spine/examples/RaptorExample.as

@@ -29,6 +29,7 @@
  *****************************************************************************/
 
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
 	import spine.atlas.Atlas;
 	import spine.*;
 	import spine.attachments.AtlasAttachmentLoader;
@@ -53,6 +54,7 @@ package spine.examples {
 		static public const RaptorAtlasTexture : Class;
 		private var skeleton : SkeletonAnimation;
 		private var gunGrabbed : Boolean;
+		private var gunGrabCount : Number = 0;
 
 		public function RaptorExample() {
 			var attachmentLoader : AttachmentLoader;
@@ -77,11 +79,18 @@ package spine.examples {
 		private function onClick(event : TouchEvent) : void {
 			var touch : Touch = event.getTouch(this);
 			if (touch && touch.phase == TouchPhase.BEGAN) {
-				if (gunGrabbed)
-					skeleton.skeleton.setToSetupPose();
-				else
-					skeleton.state.setAnimationByName(1, "gungrab", false);
-				gunGrabbed = !gunGrabbed;
+				if (gunGrabCount < 2) {
+					if (gunGrabbed)
+						skeleton.skeleton.setToSetupPose();
+					else
+						skeleton.state.setAnimationByName(1, "gungrab", false);
+					gunGrabbed = !gunGrabbed;
+					gunGrabCount++;
+				} else {
+					var parent: DisplayObjectContainer = this.parent;
+					this.removeFromParent(true);	
+					parent.addChild(new TankExample());
+				}
 			}
 		}
 	}

+ 6 - 3
spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as

@@ -29,6 +29,8 @@
  *****************************************************************************/
  
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
+	import flash.display.DisplayObject;
 	import spine.animation.TrackEntry;
 	import spine.animation.AnimationStateData;
 	import spine.*;
@@ -53,7 +55,7 @@ package spine.examples {
 
 		[Embed(source = "/spineboy.png")]
 		static public const SpineboyAtlasTexture : Class;
-		private var skeleton : SkeletonAnimation;
+		private var skeleton : SkeletonAnimation;		
 
 		public function SpineboyExample() {
 			var spineAtlas : Atlas = new Atlas(new SpineboyAtlas(), new StarlingTextureLoader(new SpineboyAtlasTexture()));
@@ -104,8 +106,9 @@ package spine.examples {
 		private function onClick(event : TouchEvent) : void {
 			var touch : Touch = event.getTouch(this);
 			if (touch && touch.phase == TouchPhase.BEGAN) {
-				skeleton.state.setAnimationByName(0, "jump", false);
-				skeleton.state.addAnimationByName(0, "run", true, 0);
+				var parent: DisplayObjectContainer = this.parent;
+				this.removeFromParent(true);			
+				parent.addChild(new GoblinsExample());				
 			}
 		}
 	}

+ 15 - 0
spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as

@@ -29,6 +29,10 @@
  *****************************************************************************/
 
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
+	import starling.events.TouchPhase;
+	import starling.events.Touch;
+	import starling.events.TouchEvent;
 	import spine.*;
 	import spine.animation.AnimationStateData;
 	import spine.animation.TrackEntry;
@@ -91,6 +95,17 @@ package spine.examples {
 
 			addChild(skeleton);
 			Starling.juggler.add(skeleton);
+			
+			addEventListener(TouchEvent.TOUCH, onClick);
+		}
+
+		private function onClick(event : TouchEvent) : void {
+			var touch : Touch = event.getTouch(this);
+			if (touch && touch.phase == TouchPhase.BEGAN) {
+				var parent: DisplayObjectContainer = this.parent;
+				this.removeFromParent(true);			
+				parent.addChild(new SpineboyExample());				
+			}
 		}
 	}
 }

+ 15 - 0
spine-starling/spine-starling-example/src/spine/examples/TankExample.as

@@ -29,6 +29,10 @@
  *****************************************************************************/
 
 package spine.examples {
+	import starling.events.TouchPhase;
+	import starling.display.DisplayObjectContainer;
+	import starling.events.Touch;
+	import starling.events.TouchEvent;
 	import spine.atlas.Atlas;
 	import spine.*;
 	import spine.attachments.AtlasAttachmentLoader;
@@ -66,6 +70,17 @@ package spine.examples {
 
 			addChild(skeleton);
 			Starling.juggler.add(skeleton);
+			
+			addEventListener(TouchEvent.TOUCH, onClick);
+		}
+
+		private function onClick(event : TouchEvent) : void {
+			var touch : Touch = event.getTouch(this);
+			if (touch && touch.phase == TouchPhase.BEGAN) {
+				var parent: DisplayObjectContainer = this.parent;
+				this.removeFromParent(true);			
+				parent.addChild(new VineExample());				
+			}
 		}
 	}
 }

+ 14 - 0
spine-starling/spine-starling-example/src/spine/examples/TwoColorExample.as

@@ -29,6 +29,10 @@
  *****************************************************************************/
 
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
+	import starling.events.TouchPhase;
+	import starling.events.Touch;
+	import starling.events.TouchEvent;
 	import spine.*;
 	import spine.atlas.Atlas;
 	import spine.attachments.AtlasAttachmentLoader;
@@ -66,6 +70,16 @@ package spine.examples {
 
 			addChild(skeleton);
 			Starling.juggler.add(skeleton);
+			addEventListener(TouchEvent.TOUCH, onClick);
+		}
+
+		private function onClick(event : TouchEvent) : void {
+			var touch : Touch = event.getTouch(this);
+			if (touch && touch.phase == TouchPhase.BEGAN) {
+				var parent: DisplayObjectContainer = this.parent;
+				this.removeFromParent(true);			
+				parent.addChild(new SpineboyExample());				
+			}
 		}
 	}
 }

+ 15 - 0
spine-starling/spine-starling-example/src/spine/examples/VineExample.as

@@ -29,6 +29,10 @@
  *****************************************************************************/
 
 package spine.examples {
+	import starling.display.DisplayObjectContainer;
+	import starling.events.TouchPhase;
+	import starling.events.Touch;
+	import starling.events.TouchEvent;
 	import spine.*;
 	import spine.atlas.Atlas;
 	import spine.attachments.AtlasAttachmentLoader;
@@ -66,6 +70,17 @@ package spine.examples {
 
 			addChild(skeleton);
 			Starling.juggler.add(skeleton);
+			
+			addEventListener(TouchEvent.TOUCH, onClick);
+		}
+
+		private function onClick(event : TouchEvent) : void {
+			var touch : Touch = event.getTouch(this);
+			if (touch && touch.phase == TouchPhase.BEGAN) {
+				var parent: DisplayObjectContainer = this.parent;
+				this.removeFromParent(true);			
+				parent.addChild(new StretchymanExample());				
+			}
 		}
 	}
 }

+ 1 - 1
spine-starling/spine-starling-example/src/spineboy.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.12-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
+"skeleton": { "hash": "pyNJVWnSVMCkMub+i4imk8DBmBY", "spine": "3.6.14-beta", "width": 470.9, "height": 731.49, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
 	{ "name": "torso", "parent": "hip", "length": 127.56, "rotation": 103.82, "x": -1.62, "y": 4.9, "color": "e0da19ff" },

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff