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

Author: pandamicro

AUTHORS.txt

@@ -1,6 +1,6 @@
 Cocos2d-html5 authors
 
-(ordered by the join in time)
+(Ordered by join time)
 
 Core Developers:
 

CCBoot.js

@@ -784,7 +784,6 @@ cc.loader = /** @lends cc.loader# */{
             this.removeEventListener('load', loadCallback, false);
             this.removeEventListener('error', errorCallback, false);
 
-            cc.loader.cache[url] = img;
             if (callback)
                 callback(null, img);
         };

cocos2d/audio/CCAudio.js

@@ -469,6 +469,7 @@ cc.Audio = cc.Class.extend({
                     self._setBufferCallback = null;
                 };
             }
+            audio._manualLoop = this._manualLoop;
         }
         audio._AUDIO_TYPE = this._AUDIO_TYPE;
         return audio;

cocos2d/core/CCScheduler.js

@@ -727,7 +727,7 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
     unscheduleAllWithMinPriority: function(minPriority){
         // Custom Selectors
         var i, element, arr = this._arrayForTimers;
-        for(i=0; i<arr.length; i++){
+        for(i=arr.length-1; i>=0; i--){
             element = arr[i];
             this.unscheduleAllForTarget(element.target);
         }

cocos2d/core/layers/CCLayer.js

@@ -83,7 +83,7 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
      * @see cc.Layer#bake and cc.Layer#unbake
      */
     isBaked: function(){
-        return this._isBaked;
+        return this._renderCmd._isBaked;
     },
 
     addChild: function(child, localZOrder, tag){

cocos2d/core/layers/CCLayerCanvasRenderCmd.js

@@ -122,6 +122,7 @@
 
         this._syncStatus(parentCmd);
         cc.renderer.pushRenderCommand(this);
+        this._cacheDirty = true;
 
         //the bakeSprite is drawing
         this._bakeSprite.visit(this);

cocos2d/core/sprites/CCBakeSprite.js

@@ -58,13 +58,20 @@ cc.BakeSprite = cc.Sprite.extend(/** @lends cc.BakeSprite# */{
      * @param {Number} [height]
      */
     resetCanvasSize: function(sizeOrWidth, height){
+        var locCanvas = this._cacheCanvas,
+            locContext = this._cacheContext,
+            strokeStyle = locContext._context.strokeStyle,
+            fillStyle = locContext._context.fillStyle;
         if(height === undefined){
             height = sizeOrWidth.height;
             sizeOrWidth = sizeOrWidth.width;
         }
-        var locCanvas = this._cacheCanvas;
         locCanvas.width = sizeOrWidth;
         locCanvas.height = height;   //TODO note baidu browser      reset the context after set width or height
+        if(strokeStyle !== locContext._context.strokeStyle)
+            locContext._context.strokeStyle = strokeStyle;
+        if(fillStyle !== locContext._context.fillStyle)
+            locContext._context.fillStyle = fillStyle;
         this.getTexture().handleLoadedTexture();
         this.setTextureRect(cc.rect(0,0, sizeOrWidth, height), false);
     }

cocos2d/labels/CCLabelBMFont.js

@@ -327,7 +327,18 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
             var fontDef = locFontDict[key];
             if (!fontDef) {
                 cc.log("cocos2d: LabelBMFont: character not found " + locStr[i]);
-                continue;
+
+                fontDef = {
+                    rect: {
+                        x: 0,
+                        y: 0,
+                        width: 0,
+                        height: 0
+                    },
+                    xOffset: 0,
+                    yOffset: 0,
+                    xAdvance: 0
+                };
             }
 
             var rect = cc.rect(fontDef.rect.x, fontDef.rect.y, fontDef.rect.width, fontDef.rect.height);

cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js

@@ -90,7 +90,7 @@
 
         //draw sprite
         var image = locSprite._texture.getHtmlElementObj();
-        if (locSprite._colorized) {
+        if (locSprite._renderCmd._colorized) {
             context.drawImage(image,
                 0, 0, locTextureCoord.width, locTextureCoord.height,
                 locX * scaleX, locY * scaleY, locWidth * scaleX, locHeight * scaleY);
@@ -226,10 +226,10 @@
             spriteCmd._syncDisplayOpacity();
         }
 
-/*        if(colorDirty || opacityDirty){
+        if(colorDirty || opacityDirty){
             spriteCmd._updateColor();
-            this._updateColor();
-        }*/
+            //this._updateColor();
+        }
 
         if (locFlag & flags.transformDirty) {
             //update the transform
@@ -256,10 +256,10 @@
             spriteCmd._updateDisplayOpacity();
         }
 
-/*        if(colorDirty || opacityDirty){
+        if(colorDirty || opacityDirty){
             spriteCmd._updateColor();
-            this._updateColor();
-        }*/
+            //this._updateColor();
+        }
 
         if(locFlag & flags.transformDirty){
             //update the transform

extensions/ccui/uiwidgets/UILoadingBar.js

@@ -240,24 +240,28 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{
         this._setPercent(percent);
     },
 
-    _setPercent: function(percent){
+    _setPercent: function(){
+        var res, rect, spriteRenderer, spriteTextureRect;
+
         if (this._totalLength <= 0)
             return;
-        var res = this._percent / 100.0;
+        res = this._percent / 100.0;
 
         if (this._scale9Enabled)
             this._setScale9Scale();
         else {
-            var spriteRenderer = this._barRenderer;
-            var rect = spriteRenderer.getTextureRect();
-            rect.width = this._barRendererTextureSize.width * res;
-            this._barRenderer.setTextureRect(
+            spriteRenderer = this._barRenderer;
+            spriteTextureRect = this._barRendererTextureSize;
+            rect = spriteRenderer.getTextureRect();
+            rect.width = spriteTextureRect.width * res;
+            spriteRenderer.setTextureRect(
                 cc.rect(
                     rect.x,
                     rect.y,
-                    this._barRendererTextureSize.width * res,
-                    this._barRendererTextureSize.height
-                )
+                    spriteTextureRect.width * res,
+                    spriteTextureRect.height
+                ),
+                spriteRenderer._rectRotated
             );
         }
     },