Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into browser_version

Author: VisualSJ

CCDebugger.js

@@ -310,10 +310,8 @@ cc._initDebugSetting = function (mode) {
                 locLog(cc.formatStr.apply(cc, arguments));
             };
         }
-    } else {
+    } else if(console && console.log.apply){//console is null when user doesn't open dev tool on IE9
         //log to console
-        if(!console)    //console is null when user doesn't open dev tool on IE9
-            return;
 
         cc.error = function(){
             return console.error.apply(console, arguments);

cocos2d/clipping-nodes/CCClippingNode.js

@@ -128,6 +128,7 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
         this._stencil = stencil;
         this.alphaThreshold = 1;
         this.inverted = false;
+        return true;
     },
 
     /**

cocos2d/core/layers/CCLayer.js

@@ -308,7 +308,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
         this._updateColor();
     },
 
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
 
     /**
      * Constructor of cc.LayerColor

cocos2d/core/renderer/RendererCanvas.js

@@ -171,7 +171,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             locHeight = node._rect.height,
             image, curColor, contentSize;
 
-        var blendChange = (node._blendFuncStr !== "source"), alpha = (node._displayedOpacity / 255);
+        var blendChange = (node._blendFuncStr !== "source-over"), alpha = (node._displayedOpacity / 255);
 
         if (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1 || node._flippedX || node._flippedY) {
             context.save();
@@ -304,7 +304,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);         //TODO
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
 
         if (needRestore) {
             context.save();
@@ -343,7 +343,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
         if(needRestore){
             context.save();
             context.globalCompositeOperation = node._blendFuncStr;
@@ -490,7 +490,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
         context.save();
         context.transform(t.a, t.c, t.b, t.d, t.tx * scaleX, -t.ty * scaleY);
 
-        if (locSprite._blendFuncStr != "source")
+        if (locSprite._blendFuncStr != "source-over")
             context.globalCompositeOperation = locSprite._blendFuncStr;
         context.globalAlpha = alpha;
 

cocos2d/core/sprites/CCSprite.js

@@ -800,7 +800,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
     _quadWebBuffer: null,
     _quadDirty: false,
     _colorized: false,
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
     _originalTexture: null,
     _drawSize_Canvas: null,
 

extensions/cocostudio/reader/timeline/CSLoader.js

@@ -268,6 +268,7 @@ ccs.csLoader = {
         // decode plist
         var textureSize = buffer["textures"].length;
         //cc.log("textureSize = %d", textureSize);
+        var frameCaches = {};
         for (var i = 0; i < textureSize; ++i)
         {
             var plist = buffer["textures"][i];
@@ -276,7 +277,10 @@ ccs.csLoader = {
             //cc.log("png = %s", png);
             plist = this._protocolBuffersPath + plist;
             png = this._protocolBuffersPath + png;
-            cc.spriteFrameCache.addSpriteFrames(plist, png);
+            frameCaches[plist] = png;
+        }
+        for(var plist in frameCaches){
+            cc.spriteFrameCache.addSpriteFrames(plist,frameCaches[plist]);
         }
         var fileDesignWidth = buffer["designWidth"];
         var fileDesignHeight = buffer["designHeight"];
@@ -331,7 +335,7 @@ ccs.csLoader = {
             var nodeOptions = nodetree["widgetOptions"];
             var options = nodetree["projectNodeOptions"];
 
-            var filePath = options.filename();
+            var filePath = options["filename"];
             //cc.log("filePath = %s", filePath);
     		if(filePath != "")
     		{
@@ -1241,4 +1245,4 @@ ccs.csLoader = {
      */
 
 };
-ccs.csLoader.init();
+ccs.csLoader.init();