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

# Conflicts:
#	cocos2d/core/CCScheduler.js

Author: pandamicro

cocos2d/actions/CCAction.js

@@ -185,15 +185,15 @@ cc.Action = cc.Class.extend(/** @lends cc.Action# */{
     },
 
     /**
-     * Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
+     * Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
      * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB. <br/>
      * This is a hack, and should be removed once JSB fixes the retain/release bug.
      */
     retain:function () {
     },
 
     /**
-     * Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
+     * Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
      * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB. <br/>
      * This is a hack, and should be removed once JSB fixes the retain/release bug.
      */
@@ -238,7 +238,7 @@ cc.Action.create = cc.action;
  * @extends cc.Action
  */
 cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{
-    //! duration in seconds
+    // duration in seconds
     _duration:0,
 
     /**
@@ -562,7 +562,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
      *
      * @param {Boolean} value
      */
-    setBoudarySet:function (value) {
+    setBoundarySet:function (value) {
         this._boundarySet = value;
     },
 

cocos2d/core/CCScheduler.js

@@ -26,12 +26,6 @@
 
 (function () {
 
-/**
- * Minimum priority level for user scheduling.
- * @constant
- * @type Number
- */
-cc.PRIORITY_NON_SYSTEM = cc.PRIORITY_SYSTEM + 1;
 
 var MAX_POOL_SIZE = 20;
 
@@ -1037,11 +1031,19 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
         this.unscheduleAllWithMinPriority(minPriority);
     }
 });
+
 /**
  * Priority level reserved for system services.
  * @constant
  * @type Number
  */
 cc.Scheduler.PRIORITY_SYSTEM = (-2147483647 - 1);
 
+/**
+ * Minimum priority level for user scheduling.
+ * @constant
+ * @type Number
+ */
+cc.Scheduler.PRIORITY_NON_SYSTEM = cc.Scheduler.PRIORITY_SYSTEM + 1;
+
 })();

cocos2d/core/base-nodes/CCNode.js

@@ -2512,6 +2512,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
                 }
             }
         }
+        return ret;
     },
 
     doEnumerate: function(name, callback){

cocos2d/particle/CCParticleSystem.js

@@ -1391,8 +1391,13 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                 locModeA.tangentialAccelVar = (pszTmp) ? parseFloat(pszTmp) : 0;
 
                 // rotation is dir
-                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary).toLowerCase();
-                locModeA.rotationIsDir = (locRotationIsDir != null && (locRotationIsDir === "true" || locRotationIsDir === "1"));
+                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary);
+                if (locRotationIsDir !== null) {
+                    locRotationIsDir = locRotationIsDir.toString().toLowerCase();
+                    locModeA.rotationIsDir = (locRotationIsDir === "true" || locRotationIsDir === "1");
+                }
+                else
+                    locModeA.rotationIsDir = false;
             } else if (this.emitterMode === cc.ParticleSystem.MODE_RADIUS) {
                 // or Mode B: radius movement
                 var locModeB = this.modeB;

extensions/ccui/base-classes/UIWidget.js

@@ -333,6 +333,7 @@ ccui.Widget = ccui.ProtectedNode.extend(/** @lends ccui.Widget# */{
      */
     setEnabled: function (enabled) {
         this._enabled = enabled;
+        this.setBright(enabled);
     },
 
     /**

extensions/spine/CCSkeletonWebGLRenderCmd.js

@@ -103,7 +103,7 @@
                     cc.glBlendFunc(cc.ONE, cc.ONE_MINUS_SRC_COLOR);
                     break;
                 default:
-                    cc.glBlendFunc(locBlendFunc.src, locBlendFunc.dst);
+                    cc.glBlendFunc(premultiAlpha ? cc.ONE : cc.SRC_ALPHA, cc.ONE_MINUS_SRC_ALPHA);
                 }
             } else if (regionTextureAtlas != textureAtlas && textureAtlas) {
                 textureAtlas.drawQuads();