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
-  size: 259, 245
-  orig: 259, 245
+  xy: 2, 609
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-front-shine-logo
+  rotate: false
+  xy: 309, 629
+  size: 282, 282
+  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-invert
+coin-front-spineboy
   rotate: false
-  xy: 263, 2
-  size: 259, 245
-  orig: 259, 245
+  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
-  size: 259, 245
-  orig: 259, 245
+  xy: 2, 609
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-front-shine-logo
+  rotate: false
+  xy: 309, 629
+  size: 282, 282
+  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-invert
+coin-front-spineboy
   rotate: false
-  xy: 263, 2
-  size: 259, 245
-  orig: 259, 245
+  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-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
-  size: 259, 245
-  orig: 259, 245
+  xy: 2, 609
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-front-shine-logo
+  rotate: false
+  xy: 309, 629
+  size: 282, 282
+  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-invert
+coin-front-spineboy
   rotate: false
-  xy: 263, 2
-  size: 259, 245
-  orig: 259, 245
+  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->setTwoColorTint(true);
+	skeletonNode->setAnimation(0, "animation", 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
-  size: 259, 245
-  orig: 259, 245
+  xy: 2, 609
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-front-shine-logo
+  rotate: false
+  xy: 309, 629
+  size: 282, 282
+  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-invert
+coin-front-spineboy
   rotate: false
-  xy: 263, 2
-  size: 259, 245
-  orig: 259, 245
+  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
-  size: 259, 245
-  orig: 259, 245
+  xy: 2, 609
+  size: 305, 302
+  orig: 305, 302
+  offset: 0, 0
+  index: -1
+coin-front-shine-logo
+  rotate: false
+  xy: 309, 629
+  size: 282, 282
+  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-invert
+coin-front-spineboy
   rotate: false
-  xy: 263, 2
-  size: 259, 245
-  orig: 259, 245
+  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