Merge branch '3.7-beta' into 3.7-beta-cpp

examples/alien/export/alien-pma.atlas

@@ -6,21 +6,21 @@ filter: Linear,Linear
 repeat: none
 back-foot
   rotate: false
-  xy: 735, 857
+  xy: 2, 2
   size: 8, 6
   orig: 8, 6
   offset: 0, 0
   index: -1
 back-shin
   rotate: false
-  xy: 681, 680
+  xy: 231, 203
   size: 21, 24
   orig: 21, 24
   offset: 0, 0
   index: -1
 back-thigh
   rotate: false
-  xy: 343, 553
+  xy: 971, 877
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -32,6 +32,13 @@ backarmor
   orig: 81, 91
   offset: 0, 0
   index: -1
+blown-up-neck
+  rotate: false
+  xy: 571, 652
+  size: 77, 52
+  orig: 77, 52
+  offset: 0, 0
+  index: -1
 body
   rotate: false
   xy: 918, 903
@@ -76,14 +83,14 @@ eye
   index: -1
 eye-highlight
   rotate: false
-  xy: 231, 205
+  xy: 261, 256
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 eye-pupil
   rotate: false
-  xy: 963, 883
+  xy: 293, 305
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
@@ -97,14 +104,14 @@ eye-stalk
   index: -1
 front-foot
   rotate: false
-  xy: 2, 2
+  xy: 343, 542
   size: 10, 6
   orig: 10, 6
   offset: 0, 0
   index: -1
 front-lower-arm
-  rotate: false
+  rotate: true
-  xy: 571, 641
+  xy: 650, 649
   size: 55, 63
   orig: 55, 63
   offset: 0, 0
@@ -118,7 +125,7 @@ front-shin
   index: -1
 front-thigh
   rotate: false
-  xy: 261, 296
+  xy: 343, 550
   size: 27, 27
   orig: 27, 27
   offset: 0, 0
@@ -139,7 +146,7 @@ head
   index: -1
 lower-back-arm
   rotate: false
-  xy: 628, 658
+  xy: 918, 855
   size: 51, 46
   orig: 51, 46
   offset: 0, 0
@@ -180,8 +187,8 @@ splat03
   offset: 0, 0
   index: -1
 upper-back-arm
-  rotate: true
+  rotate: false
-  xy: 918, 871
+  xy: 261, 280
   size: 30, 43
   orig: 30, 43
   offset: 0, 0

examples/alien/export/alien.atlas

@@ -6,21 +6,21 @@ filter: Linear,Linear
 repeat: none
 back-foot
   rotate: false
-  xy: 735, 857
+  xy: 2, 2
   size: 8, 6
   orig: 8, 6
   offset: 0, 0
   index: -1
 back-shin
   rotate: false
-  xy: 681, 680
+  xy: 231, 203
   size: 21, 24
   orig: 21, 24
   offset: 0, 0
   index: -1
 back-thigh
   rotate: false
-  xy: 343, 553
+  xy: 971, 877
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -32,6 +32,13 @@ backarmor
   orig: 81, 91
   offset: 0, 0
   index: -1
+blown-up-neck
+  rotate: false
+  xy: 571, 652
+  size: 77, 52
+  orig: 77, 52
+  offset: 0, 0
+  index: -1
 body
   rotate: false
   xy: 918, 903
@@ -76,14 +83,14 @@ eye
   index: -1
 eye-highlight
   rotate: false
-  xy: 231, 205
+  xy: 261, 256
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 eye-pupil
   rotate: false
-  xy: 963, 883
+  xy: 293, 305
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
@@ -97,14 +104,14 @@ eye-stalk
   index: -1
 front-foot
   rotate: false
-  xy: 2, 2
+  xy: 343, 542
   size: 10, 6
   orig: 10, 6
   offset: 0, 0
   index: -1
 front-lower-arm
-  rotate: false
+  rotate: true
-  xy: 571, 641
+  xy: 650, 649
   size: 55, 63
   orig: 55, 63
   offset: 0, 0
@@ -118,7 +125,7 @@ front-shin
   index: -1
 front-thigh
   rotate: false
-  xy: 261, 296
+  xy: 343, 550
   size: 27, 27
   orig: 27, 27
   offset: 0, 0
@@ -139,7 +146,7 @@ head
   index: -1
 lower-back-arm
   rotate: false
-  xy: 628, 658
+  xy: 918, 855
   size: 51, 46
   orig: 51, 46
   offset: 0, 0
@@ -180,8 +187,8 @@ splat03
   offset: 0, 0
   index: -1
 upper-back-arm
-  rotate: true
+  rotate: false
-  xy: 918, 871
+  xy: 261, 280
   size: 30, 43
   orig: 30, 43
   offset: 0, 0

examples/export/export.sh

@@ -12,6 +12,9 @@ if [ ! -f "$SPINE_EXE" ]; then
 fi
 echo "Spine exe: $SPINE_EXE"
 
+echo "Please enter the Spine editor version to use to clean the examples (e.g. 3.7.58-beta)"
+read version
+
 echo "Cleaning export directories ..."
 rm -rf ../alien/export/*
 rm -rf ../coin/export/*
@@ -31,6 +34,7 @@ rm -rf ../owl/export/*
 echo ""
 echo "Exporting..."
 "$SPINE_EXE" \
+-u $version -f \
 -i ../alien/alien-ess.spine -o ../alien/export -e json.json \
 -i ../alien/alien-ess.spine -o ../alien/export -e binary.json \
 -i ../alien/alien-pro.spine -o ../alien/export -e json.json \

examples/spinosaurus/export/spinosaurus-ess.json

@@ -1 +1 @@
-{"skeleton":{"hash":"B2ZPp7lIxBrN+g+ALWuTw4IWKYE","spine":"99.99.99","width":1680,"height":1782.28,"images":"./images/","audio":""},"bones":[{"name":"root","y":-526.32},{"name":"leaves","parent":"root","x":-0.17,"y":1310.1},{"name":"logo","parent":"root","y":1332.03},{"name":"play","parent":"root","x":3.02,"y":-83.61},{"name":"quit","parent":"root","x":-2.86,"y":-201.21},{"name":"settings","parent":"root","x":3.02,"y":-144.37}],"slots":[{"name":"background","bone":"root"},{"name":"leaves","bone":"leaves","attachment":"leaves"},{"name":"logo","bone":"logo","attachment":"logo"},{"name":"play","bone":"play","color":"fff99dff","attachment":"play"},{"name":"quit","bone":"quit","color":"fff99dff","attachment":"quit"},{"name":"settings","bone":"settings","color":"fff99dff","attachment":"settings"}],"skins":{"default":{"leaves":{"leaves":{"y":-28.54,"width":1042,"height":522}},"logo":{"logo":{"y":-20.4,"width":917,"height":323}},"play":{"play":{"width":218,"height":77}},"quit":{"quit":{"width":216,"height":77}},"settings":{"settings":{"width":446,"height":76}}}},"animations":{"animation":{"slots":{"leaves":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"logo":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"play":{"color":[{"time":1.3333,"color":"fff99dff"},{"time":1.5667,"color":"ffffffff","curve":"stepped"},{"time":1.8333,"color":"ffffffff"},{"time":2.0667,"color":"fff99dff"}]},"quit":{"color":[{"time":2.4,"color":"fff99dff"},{"time":2.6333,"color":"ffffffff"}]},"settings":{"color":[{"time":1.8667,"color":"fff99dff"},{"time":2.1,"color":"ffffffff","curve":"stepped"},{"time":2.3667,"color":"ffffffff"},{"time":2.6,"color":"fff99dff"}]}},"bones":{"logo":{"translate":[{"time":0,"x":0,"y":40.8,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0,"y":-597.72,"curve":[0.425,0.17,0.592,1]},{"time":1,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":1.6667,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":2.3333,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":3,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":3.6667,"x":0,"y":-583.72}],"scale":[{"time":0,"x":0.342,"y":0.342,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1,"curve":[0.19,0.38,0.658,0.99]},{"time":1,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":1.6667,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":2.3333,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":3,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":3.6667,"x":1.02,"y":1.03}]},"play":{"translate":[{"time":0.6667,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":0.8667,"x":0,"y":480.2}],"scale":[{"time":1.3333,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":1.5667,"x":1.231,"y":1.231,"curve":"stepped"},{"time":1.8333,"x":1.231,"y":1.231,"curve":[0,0,0.526,2.46]},{"time":2.0667,"x":1,"y":1}]},"settings":{"translate":[{"time":0.8,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1,"x":0,"y":431.2}],"scale":[{"time":1.8667,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.1,"x":1.23,"y":1.23,"curve":"stepped"},{"time":2.3667,"x":1.23,"y":1.23,"curve":[0,0,0.526,2.46]},{"time":2.6,"x":1,"y":1}]},"quit":{"translate":[{"time":0.9333,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1.1333,"x":0,"y":376.32}],"scale":[{"time":2.4,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.6333,"x":1.23,"y":1.23}]},"leaves":{"translate":[{"time":0,"x":0,"y":0,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0.17,"y":-601.24,"curve":[0.425,0.17,0.592,1]},{"time":1.3333,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":2,"x":0.17,"y":-595.12},{"time":2.6667,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":3.3333,"x":0.17,"y":-595.12}],"scale":[{"time":0,"x":0.34,"y":0.34,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1},{"time":1.3333,"x":1.03,"y":1.02},{"time":2,"x":1,"y":1},{"time":2.6667,"x":1.03,"y":1.02},{"time":3.3333,"x":1,"y":1}]}}}}}
+{"skeleton":{"hash":"B2ZPp7lIxBrN+g+ALWuTw4IWKYE","spine":"3.7.61-beta","width":1680,"height":1782.28,"images":"./images/","audio":""},"bones":[{"name":"root","y":-526.32},{"name":"leaves","parent":"root","x":-0.17,"y":1310.1},{"name":"logo","parent":"root","y":1332.03},{"name":"play","parent":"root","x":3.02,"y":-83.61},{"name":"quit","parent":"root","x":-2.86,"y":-201.21},{"name":"settings","parent":"root","x":3.02,"y":-144.37}],"slots":[{"name":"background","bone":"root"},{"name":"leaves","bone":"leaves","attachment":"leaves"},{"name":"logo","bone":"logo","attachment":"logo"},{"name":"play","bone":"play","color":"fff99dff","attachment":"play"},{"name":"quit","bone":"quit","color":"fff99dff","attachment":"quit"},{"name":"settings","bone":"settings","color":"fff99dff","attachment":"settings"}],"skins":{"default":{"leaves":{"leaves":{"y":-28.54,"width":1042,"height":522}},"logo":{"logo":{"y":-20.4,"width":917,"height":323}},"play":{"play":{"width":218,"height":77}},"quit":{"quit":{"width":216,"height":77}},"settings":{"settings":{"width":446,"height":76}}}},"animations":{"animation":{"slots":{"leaves":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"logo":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"play":{"color":[{"time":1.3333,"color":"fff99dff"},{"time":1.5667,"color":"ffffffff","curve":"stepped"},{"time":1.8333,"color":"ffffffff"},{"time":2.0667,"color":"fff99dff"}]},"quit":{"color":[{"time":2.4,"color":"fff99dff"},{"time":2.6333,"color":"ffffffff"}]},"settings":{"color":[{"time":1.8667,"color":"fff99dff"},{"time":2.1,"color":"ffffffff","curve":"stepped"},{"time":2.3667,"color":"ffffffff"},{"time":2.6,"color":"fff99dff"}]}},"bones":{"logo":{"translate":[{"time":0,"x":0,"y":40.8,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0,"y":-597.72,"curve":[0.425,0.17,0.592,1]},{"time":1,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":1.6667,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":2.3333,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":3,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":3.6667,"x":0,"y":-583.72}],"scale":[{"time":0,"x":0.342,"y":0.342,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1,"curve":[0.19,0.38,0.658,0.99]},{"time":1,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":1.6667,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":2.3333,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":3,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":3.6667,"x":1.02,"y":1.03}]},"play":{"translate":[{"time":0.6667,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":0.8667,"x":0,"y":480.2}],"scale":[{"time":1.3333,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":1.5667,"x":1.231,"y":1.231,"curve":"stepped"},{"time":1.8333,"x":1.231,"y":1.231,"curve":[0,0,0.526,2.46]},{"time":2.0667,"x":1,"y":1}]},"settings":{"translate":[{"time":0.8,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1,"x":0,"y":431.2}],"scale":[{"time":1.8667,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.1,"x":1.23,"y":1.23,"curve":"stepped"},{"time":2.3667,"x":1.23,"y":1.23,"curve":[0,0,0.526,2.46]},{"time":2.6,"x":1,"y":1}]},"quit":{"translate":[{"time":0.9333,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1.1333,"x":0,"y":376.32}],"scale":[{"time":2.4,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.6333,"x":1.23,"y":1.23}]},"leaves":{"translate":[{"time":0,"x":0,"y":0,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0.17,"y":-601.24,"curve":[0.425,0.17,0.592,1]},{"time":1.3333,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":2,"x":0.17,"y":-595.12},{"time":2.6667,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":3.3333,"x":0.17,"y":-595.12}],"scale":[{"time":0,"x":0.34,"y":0.34,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1},{"time":1.3333,"x":1.03,"y":1.02},{"time":2,"x":1,"y":1},{"time":2.6667,"x":1.03,"y":1.02},{"time":3.3333,"x":1,"y":1}]}}}}}