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

examples/coin/export/coin-pma.atlas

@@ -1,26 +1,54 @@
 
 coin-pma.png
-size: 1024,256
+size: 1024,1024
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-coin
+coin-front-logo
   rotate: false
-  xy: 2, 2
+  xy: 2, 609
-  size: 259, 245
+  size: 305, 302
-  orig: 259, 245
+  orig: 305, 302
   offset: 0, 0
   index: -1
-coin-invert
+coin-front-shine-logo
   rotate: false
-  xy: 263, 2
+  xy: 309, 629
-  size: 259, 245
+  size: 282, 282
-  orig: 259, 245
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-shine-spineboy
+  rotate: false
+  xy: 2, 21
+  size: 282, 282
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-spineboy
+  rotate: false
+  xy: 2, 305
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-side-round
+  rotate: false
+  xy: 309, 345
+  size: 144, 282
+  orig: 144, 282
+  offset: 0, 0
+  index: -1
+coin-side-straight
+  rotate: true
+  xy: 2, 2
+  size: 17, 282
+  orig: 17, 282
   offset: 0, 0
   index: -1
 shine
   rotate: false
-  xy: 524, 2
+  xy: 593, 666
   size: 72, 245
   orig: 72, 245
   offset: 0, 0

examples/coin/export/coin.atlas

@@ -1,26 +1,54 @@
 
 coin.png
-size: 1024,256
+size: 1024,1024
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-coin
+coin-front-logo
   rotate: false
-  xy: 2, 2
+  xy: 2, 609
-  size: 259, 245
+  size: 305, 302
-  orig: 259, 245
+  orig: 305, 302
   offset: 0, 0
   index: -1
-coin-invert
+coin-front-shine-logo
   rotate: false
-  xy: 263, 2
+  xy: 309, 629
-  size: 259, 245
+  size: 282, 282
-  orig: 259, 245
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-shine-spineboy
+  rotate: false
+  xy: 2, 21
+  size: 282, 282
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-spineboy
+  rotate: false
+  xy: 2, 305
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-side-round
+  rotate: false
+  xy: 309, 345
+  size: 144, 282
+  orig: 144, 282
+  offset: 0, 0
+  index: -1
+coin-side-straight
+  rotate: true
+  xy: 2, 2
+  size: 17, 282
+  orig: 17, 282
   offset: 0, 0
   index: -1
 shine
   rotate: false
-  xy: 524, 2
+  xy: 593, 666
   size: 72, 245
   orig: 72, 245
   offset: 0, 0

examples/spinosaurus/export/spinosaurus-ess.json

@@ -1 +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}]}}}}}
+{"skeleton":{"hash":"B2ZPp7lIxBrN+g+ALWuTw4IWKYE","spine":"3.7.68-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}]}}}}}

spine-cocos2d-objc/Resources/coin.atlas

@@ -1,26 +1,54 @@
 
 coin.png
-size: 1024,256
+size: 1024,1024
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-coin
+coin-front-logo
   rotate: false
-  xy: 2, 2
+  xy: 2, 609
-  size: 259, 245
+  size: 305, 302
-  orig: 259, 245
+  orig: 305, 302
   offset: 0, 0
   index: -1
-coin-invert
+coin-front-shine-logo
   rotate: false
-  xy: 263, 2
+  xy: 309, 629
-  size: 259, 245
+  size: 282, 282
-  orig: 259, 245
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-shine-spineboy
+  rotate: false
+  xy: 2, 21
+  size: 282, 282
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-spineboy
+  rotate: false
+  xy: 2, 305
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-side-round
+  rotate: false
+  xy: 309, 345
+  size: 144, 282
+  orig: 144, 282
+  offset: 0, 0
+  index: -1
+coin-side-straight
+  rotate: true
+  xy: 2, 2
+  size: 17, 282
+  orig: 17, 282
   offset: 0, 0
   index: -1
 shine
   rotate: false
-  xy: 524, 2
+  xy: 593, 666
   size: 72, 245
   orig: 72, 245
   offset: 0, 0

spine-cocos2dx/example/Classes/BatchingExample.cpp

@@ -59,7 +59,7 @@ bool BatchingExample::init () {
 	// Load the skeleton data.
 	SkeletonJson* json = new (__FILE__, __LINE__) SkeletonJson(_attachmentLoader);
 	json->setScale(0.6f); // Resizes skeleton data to 60% of the size it was in Spine.
-	_skeletonData = json->readSkeletonDataFile("spineboy-ess.json");
+	_skeletonData = json->readSkeletonDataFile("spineboy-pro.json");
 	CCASSERT(_skeletonData, json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file.");
 	delete json;
 

spine-cocos2dx/example/Classes/CoinExample.cpp

@@ -44,10 +44,9 @@ bool CoinExample::init () {
 	if (!LayerColor::initWithColor(Color4B(128, 128, 128, 255))) return false;
 
 	skeletonNode = SkeletonAnimation::createWithBinaryFile("coin-pro.skel", "coin.atlas", 1);
-	skeletonNode->setAnimation(0, "rotate", true);
+	skeletonNode->setAnimation(0, "animation", true);
-	// skeletonNode->setTwoColorTint(true);
 
-	skeletonNode->setPosition(Vec2(_contentSize.width / 2, 100));
+	skeletonNode->setPosition(Vec2(_contentSize.width / 2, _contentSize.height / 2));
 	addChild(skeletonNode);
 
 	scheduleUpdate();

spine-cocos2dx/example/Classes/SkeletonRendererSeparatorExample.cpp

@@ -45,7 +45,7 @@ bool SkeletonRendererSeparatorExample::init () {
 
 	// Spineboy's back, which will manage the animation and GPU resources
 	// will render only the front slots of Spineboy
-	backNode = SkeletonAnimation::createWithJsonFile("spineboy-ess.json", "spineboy.atlas", 0.6f);
+	backNode = SkeletonAnimation::createWithJsonFile("spineboy-pro.json", "spineboy.atlas", 0.6f);
 	backNode->setMix("walk", "jump", 0.4);
 	backNode->setAnimation(0, "walk", true);
 	backNode->setSlotsRange(backNode->findSlot("rear-upper-arm")->getData().getIndex(), backNode->findSlot("rear-shin")->getData().getIndex());

spine-cocos2dx/example/Resources/common/coin.atlas

@@ -1,26 +1,54 @@
 
 coin.png
-size: 1024,256
+size: 1024,1024
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-coin
+coin-front-logo
   rotate: false
-  xy: 2, 2
+  xy: 2, 609
-  size: 259, 245
+  size: 305, 302
-  orig: 259, 245
+  orig: 305, 302
   offset: 0, 0
   index: -1
-coin-invert
+coin-front-shine-logo
   rotate: false
-  xy: 263, 2
+  xy: 309, 629
-  size: 259, 245
+  size: 282, 282
-  orig: 259, 245
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-shine-spineboy
+  rotate: false
+  xy: 2, 21
+  size: 282, 282
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-spineboy
+  rotate: false
+  xy: 2, 305
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-side-round
+  rotate: false
+  xy: 309, 345
+  size: 144, 282
+  orig: 144, 282
+  offset: 0, 0
+  index: -1
+coin-side-straight
+  rotate: true
+  xy: 2, 2
+  size: 17, 282
+  orig: 17, 282
   offset: 0, 0
   index: -1
 shine
   rotate: false
-  xy: 524, 2
+  xy: 593, 666
   size: 72, 245
   orig: 72, 245
   offset: 0, 0

spine-corona/data/coin.atlas

@@ -1,26 +1,54 @@
 
 coin.png
-size: 1024,256
+size: 1024,1024
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-coin
+coin-front-logo
   rotate: false
-  xy: 2, 2
+  xy: 2, 609
-  size: 259, 245
+  size: 305, 302
-  orig: 259, 245
+  orig: 305, 302
   offset: 0, 0
   index: -1
-coin-invert
+coin-front-shine-logo
   rotate: false
-  xy: 263, 2
+  xy: 309, 629
-  size: 259, 245
+  size: 282, 282
-  orig: 259, 245
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-shine-spineboy
+  rotate: false
+  xy: 2, 21
+  size: 282, 282
+  orig: 282, 282
+  offset: 0, 0
+  index: -1
+coin-front-spineboy
+  rotate: false
+  xy: 2, 305
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-side-round
+  rotate: false
+  xy: 309, 345
+  size: 144, 282
+  orig: 144, 282
+  offset: 0, 0
+  index: -1
+coin-side-straight
+  rotate: true
+  xy: 2, 2
+  size: 17, 282
+  orig: 17, 282
   offset: 0, 0
   index: -1
 shine
   rotate: false
-  xy: 524, 2
+  xy: 593, 666
   size: 72, 245
   orig: 72, 245
   offset: 0, 0