Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5941_WebGLRenderer

Author: dingpinglv

CCBoot.js

@@ -244,15 +244,15 @@ cc.AsyncPool = function(srcObj, limit, iterator, onEnd, target){
                 self._isErr = true;
                 if(self._onEnd)
                     self._onEnd.call(self._onEndTarget, err);
-                return
+                return;
             }
 
             var arr = Array.prototype.slice.call(arguments, 1);
             self._results[this.index] = arr[0];
             if(self.finishedSize == self.size) {
                 if(self._onEnd)
                     self._onEnd.call(self._onEndTarget, null, self._results);
-                return
+                return;
             }
             self._handleItem();
         }.bind(item), self);
@@ -419,7 +419,7 @@ cc.path = /** @lends cc.path# */{
             if(idx !== -1)
                return fileName.substring(0,idx);
         }
-        return fileName
+        return fileName;
     },
 
     /**

CHANGELOG.txt

@@ -1,5 +1,31 @@
 ChangeLog:
 
+Cocos2d-JS v3.1 beta @ Oct.13, 2014
+
+* Refactoration of the web engine with new renderer on the architecture level, optimization is under going.
+* Released Facebook SDK for Cocos2d-JS beta2, its API have been significantly improved and stablized.
+* Upgraded MoonWarriors sample with new set of graphical assets.
+* Automatically enabled WebGL on iOS 8 safari.
+* Upgraded chipmunk.js to the newest version.
+* Supported setting color of shadow for `cc.LabelTTF`.
+* Added `getTitleRenderer` function to ccui.Button.
+* Supported Coco Studio timeline animation.
+* Set the default value of LabelAtlas's `cascadeOpacityEnabled` and `cascadeColorEnabled` to true.
+* Added a listener of texture to `cc.Sprite#setTexture` when the texture hasn't loaded.
+* Activated `cc.pool` for all kind of objects.
+* Added query test for chipmunk and added necessary JavaScript bindings.
+
+* Bugs fix:
+    1. Fixed a bug of `cc.ComponentContainer` that a 'if' statement behavior is incorrect.
+    2. Fixed a bug of `cc.Scale9Sprite` that the behavior of Canvas and WebGL is different.
+    3. Fixed a bug of `cc.EventListener` that its pause state should set to true.
+    4. Fixed a bug of `cc.ParticleSystem` that it should apply canvas scaling on canvas rendering mode.
+    5. Fixed a bug of CCBoot.js that `cc.loader` should add a condition to check whether `crossOrign` property is undefined on IE9 and IE10.
+    6. Fixed a bug of `ccui.Widget` that its `setPosition` function's behavior is incorrect.
+    7. Fixed a bug of `ccui.LoadingBar` that its `barRenderer` should add to protected children array.
+    8. Fixed a bug of `cc.Texture2D` that its `TEXTURE_MAG_FILTER` should set to LINEAR.
+    9. Fixed a bug of `cc.TMXMapInfo` that its doesn't parse `rotation` property.
+
 Cocos2d-JS-v3.0 Final @ Sep.10, 2014
 
 * Facebook SDK Beta2: Added `appRequest` API.

cocos2d/core/platform/CCConfig.js

@@ -31,7 +31,7 @@
  * @type {String}
  * @name cc.ENGINE_VERSION
  */
-window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.0 Final";
+window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.1 Beta";
 
 /**
  * <p>

tools/build.xml

@@ -5,7 +5,7 @@
              classpath="./compiler/compiler.jar"/>
     <target name="compile">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.0-min.js">
+                debug="false" output="./../lib/cocos2d-js-v3.1-beta-min.js">
             <!--sourceMapOutputFile="./../lib/cocos2d-html5-v3.0-rc0-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="Base64Images.js"/>
@@ -246,7 +246,7 @@
 
     <target name="compile_core">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.0-core-min.js">
+                debug="false" output="./../lib/cocos2d-js-v3.1-beta-core-min.js">
             <!--sourceMapOutputFile="./../lib/cocos2d-html5-v3.0-rc0-core-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="CCBoot.js"/>