From 2f012b3e56b467f1eee9f124c496b9f89d182d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Andu=CC=81jar=20Clavell?=
 <jandujar@jandujar.com>
Date: Tue, 12 Nov 2013 14:56:02 +0100
Subject: [PATCH 1/2] change animation bone skin by name

---
 extensions/CocoStudio/Armature/CCBone.js      |  9 ++++++++
 .../Armature/display/CCDisplayManager.js      | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/extensions/CocoStudio/Armature/CCBone.js b/extensions/CocoStudio/Armature/CCBone.js
index 2f32739645..ce3fcab70c 100644
--- a/extensions/CocoStudio/Armature/CCBone.js
+++ b/extensions/CocoStudio/Armature/CCBone.js
@@ -425,6 +425,15 @@ ccs.Bone = cc.NodeRGBA.extend({
         this._displayManager.changeDisplayByIndex(index, force);
     },
 
+    /**
+     * change display by name
+     * @param {Number} name
+     * @param {Boolean} force
+     */
+    changeDisplayByName:function (name, force) {
+        this._displayManager.changeDisplayByName(name, force);
+    },
+
     /**
      * displayManager setter
      * @param {ccs.DisplayManager}
diff --git a/extensions/CocoStudio/Armature/display/CCDisplayManager.js b/extensions/CocoStudio/Armature/display/CCDisplayManager.js
index 05455b63fe..213d71b562 100644
--- a/extensions/CocoStudio/Armature/display/CCDisplayManager.js
+++ b/extensions/CocoStudio/Armature/display/CCDisplayManager.js
@@ -142,6 +142,28 @@ ccs.DisplayManager = cc.Class.extend({
 
         this.setCurrentDecorativeDisplay(decoDisplay);
     },
+    changeDisplayByName:function (name, force){
+        var decoDisplay;
+        this._forceChangeDisplay = force;
+
+        for(var index = 0; index < this._decoDisplayList.length;index++){
+            var display = this._decoDisplayList[index].getDisplay();
+            if( (typeof(display.getDisplayName) != "undefined") && name == this._decoDisplayList[index].getDisplay().getDisplayName()){
+               decoDisplay = this._decoDisplayList[index];
+               this._displayIndex = index;
+               break;
+            }
+        }
+
+
+        if(!decoDisplay){
+            return;
+        }
+
+
+        this.setCurrentDecorativeDisplay(decoDisplay);
+
+    },
 
     setCurrentDecorativeDisplay:function (decoDisplay) {
         var locCurrentDecoDisplay = this._currentDecoDisplay;

From 70489253329b54fce98effc71a44125cabdd1bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Antonio=20Andu=CC=81jar=20Clavell?=
 <jandujar@jandujar.com>
Date: Mon, 10 Feb 2014 17:26:45 +0100
Subject: [PATCH 2/2] Bug in SceneReader setPropertyFromJsonDict

---
 extensions/CocoStudio/Reader/SceneReader.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/CocoStudio/Reader/SceneReader.js b/extensions/CocoStudio/Reader/SceneReader.js
index b4c07e098d..87e9832776 100644
--- a/extensions/CocoStudio/Reader/SceneReader.js
+++ b/extensions/CocoStudio/Reader/SceneReader.js
@@ -348,25 +348,25 @@ ccs.SceneReader = ccs.Class.extend(/** @lends ccs.SceneReader# */{
      * @param {Object} dict
      */
     setPropertyFromJsonDict: function (node, dict) {
-        var x = dict["x"] || 0;
-        var y = dict["y"] || 0;
+        var x = (typeof dict["x"] === 'undefined')?0:dict["x"];
+        var y = (typeof dict["y"] === 'undefined')?0:dict["y"];
         node.setPosition(cc.p(x, y));
 
-        var bVisible = Boolean(dict["visible"] || 1);
+        var bVisible = Boolean((typeof dict["visible"] === 'undefined')?1:dict["visible"]);
         node.setVisible(bVisible);
 
-        var nTag = dict["objecttag"] || -1;
+        var nTag = (typeof dict["objecttag"] === 'undefined')?-1:dict["objecttag"];
         node.setTag(nTag);
 
-        var nZorder = dict["zorder"] || 0;
+        var nZorder = (typeof dict["zorder"] === 'undefined')?0:dict["zorder"];
         node.setZOrder(nZorder);
 
-        var fScaleX = dict["scalex"] || 1;
-        var fScaleY = dict["scaley"] || 1;
+        var fScaleX = (typeof dict["scalex"] === 'undefined')?1:dict["scalex"];
+        var fScaleY = (typeof dict["scaley"] === 'undefined')?1:dict["scaley"];
         node.setScaleX(fScaleX);
         node.setScaleY(fScaleY);
 
-        var fRotationZ = dict["rotation"] || 0;
+        var fRotationZ = (typeof dict["rotation"] === 'undefined')?0:dict["rotation"];
         node.setRotation(fRotationZ);
     },
     setTarget : function(selector,listener){