Issue #4768: merge develop branch to master branch

.gitignore

@@ -4,3 +4,4 @@ lib
 build
 aspnet_client
 node_modules
+/tools/jsdoc_toolkit-2.4.0

AUTHORS.txt

@@ -10,20 +10,21 @@ Core Developers:
 
     Dingping Lv (David Lv)
 
-    Shengxiang Chen (Nero Chan)
-
     Ricardo Quesada
 
-    Xingsen Ma
-
     Huabin LING
 
+    Sijie Wang
+
+    Jialong Zhai
+
 Contributors:
 Name                GithubID    Main contribution
 
 Dali Kilani         @dadilcool  added instruction to read me
 
 Chris               @hannon235	added node.js api for box2d
+                                added SocketIO and SocketIO tests
 
 Jason Aeschliman    @jaeschliman  fixed cc.Node setposition
 
@@ -101,6 +102,18 @@ Christian Schwartz   @cschwartz    SpriteFrame.initWithTextureFilename converted
 XiaoJun Zheng        @SmallAiTT    _getResType error fix
                                    cc.ScrollView bug fix
                                    cc.LabelTTF bug fix
+                                   rewrite functions in CCNS.js with regex
+                                   refactor CCScheduler.js and CCCommon.js
+                                   cc.BMFontConfiguration bug fix
+                                   refactor cc.Application to cc.game
+                                   refactor cc.loader
+                                   refactor cc.Textur2D
+                                   refactor some functions about array operation
+                                   move sys.xxx to cc.sys.xxx
+                                   refactor some public functions in cc to private
+                                   add node.js scripts for publishing game
+                                   refactor cc.CCBReader
+                                   cc.view bug fix
 
 Guozhu Cheng         @bengol       cc.SimpleAudioEngine bug fix
 
@@ -118,11 +131,12 @@ Luis Parravicini     @luisparravicini      cc.Director refactoring
                                            typo fix
 
 Jose Antonio         @jandujar      cc.ParticleSystem bug fix for CocoStudio animations
+                                    SceneReader bug fix
 
 BoHao Tang           @btspoony      cc.TableView bug fix
 
 Claudiu              @csaftoiu      cc.LabelTTF bug fix
-                                    cc.DrawNode bug fix
+                                    cc.DrawNode bugs fix
                                     cc.NodeRGBA bug fix
                                     cc.Texture2D bug fix
 
@@ -135,8 +149,29 @@ kuaipao              @kuaipao       CocoStudio GUIReader bug fix
 
 XieDaijin            @NijiadeIX     CCControl bug fix
 
+samael               @samael65535   CCPhysicsSprite bug fix
+
+NatWeiss             @NatWeiss      Add analytics plugin protocol ,Flurry plugin and ProtocolAds.js plugin protocol
+                                    cc.FileUtils refactoring
+
+Andor Salga          @asalga        typo fix
+
+erykwalder           @erykwalder    Function.prototype.bind bug fix
+
+ZippoLag             @ZippoLag      cc.Application.getCurrentLanguage bug fix
+                                    typo fix
+
+Asano                @LaercioAsano  cc.Node bug fix
+
+Bruno Assarisse      @bassarisse    cc.LabelBMFont bug fix
+
+
+Retired Core Developers:
+      Shengxiang Chen (Nero Chan)
+      Xingsen Ma
+
 Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.
 
-Thanks to all developers who report & trace bugs, dicuss the engine usage in forum & QQ groups!
+Thanks to all developers who report & trace bugs, discuss the engine usage in forum & QQ groups!
 
 Special thanks to Ricardo Quesada for giving us lots of guidances & suggestions.

CHANGELOG.txt

@@ -1,4 +1,47 @@
 ChangeLog:
+
+Cocos2d-html5-v2.2.3 @ April.14, 2014
+
+* Delete cc._PointConst and cc._SizeConst from cc.Node and cc.Sprite, they are very unkind for developers.
+* Refactor Array clean function for better performance.
+* Rewrite functions in CCNS.js with regex.
+* Make cc.p and cc.size support two types of parameters.
+* cc.EGLView on WebGL mode now share the same viewport as Canvas mode.
+* Add retina display support for Apple devices to cc.EGLView.
+* Add swallow option to cc.Layer's setTouchEnabled function
+* Refactor cc.Node's nodeToParentTransform for better performance.
+* Refactor FadeIn/FadeOut to fix a bug that it always start from or end up 255.
+* WebAudioEngine is supported on iOS now.
+* Use event on cc.canvas to make full screen.
+* Add "allLayers" function to cc.TMXTiledMap.
+* Refactoring CCCommon.js, delete some unused functions, rename some functions for better maintainability.
+* add more jsdoc information to framework.
+* Add a browser white list that support multiple audio playback at the same time.
+* Removed in/hasOwnProperty usage in engine for better performance.
+* Arguments length check replaced by undefined check for better performance.
+* Fix legacy Function.prototype.bind support.
+* Add an assert to cc.Sprite for debug friendly.
+
+* Bugs fix:
+    1. Avoid CCLabelTTF enter in infinite loop while character's width larger than the dimension width
+    2. Add jsDoc Flags to cc.NodeRGBA and cc.LayerRGBA
+    3. Fixed a bug that Schedule doesn't restart when widget is re-added after being removed
+    4. Correction of split logic in CCLabelTTF
+    4. Fixed a bug of cc.Sprite that its setCascadeColorEnabled and setCascadeOpacityEnabled  don't work well.
+    5. Fixed a bug in CCEGLView that related to the event location conversion
+    6. Fixed a bug of armature animation that it doesn't display correctly in Canvas Mode
+    7. Fixed a bug of cc.Editbox that its position is incorrect when its parent node isn't root node.
+    8. Fixed a bug of UILabelBMFont that variable `_strStringValue` should be `_stringValue`
+    9. Fixed a bug of cc.TMXLayer that its `removeChild` works incorrectly.
+    10. Fixed a bug of cc.FileUtils that its search path is incorrect.
+    11. Fixed a bug of cc.Node that it doesn't reorder after setZOrder.
+    12. Fixed a bug of cc.LabelBMFont that it's multiline works incorrectly.
+
+* Known Issues:
+     1. Effect Advanced Lens3D doesn't work
+     2. ClipNodeTest effects varies in different browsers
+     3. Stencil of cc.ClippingNode doesn't work well with WEBGL render mode, the stencil have the right size and shape but it masks the content with a monochrome mask.
+
 Cocos2d-html5-v2.2.2 @ Dec.31, 2013
 * Resolution policy now act as a combination of cc.ContainerStrategy and cc.ContentStrategy so that user can beautifully customize its behavior.
 * cc.LabelTTF's now support perfectly automatic line break with occidental and Chinese characters.

HelloHTML5World/build.xml

@@ -25,7 +25,6 @@
                 <file name="core/platform/CCEGLView.js"/>
                 <file name="core/platform/CCScreen.js"/>
                 <file name="core/platform/CCVisibleRect.js"/>
-                <file name="core/cocoa/CCNS.js"/>
                 <file name="core/cocoa/CCAffineTransform.js"/>
                 <file name="core/support/CCPointExtension.js"/>
                 <file name="core/support/CCVertex.js"/>
@@ -98,7 +97,6 @@
                 <file name="compress/base64.js"/>
                 <file name="compress/gzip.js"/>
                 <file name="compress/zlib.min.js"/>
-                <file name="particle_nodes/CCFormatHelper.js"/>
                 <file name="particle_nodes/CCPNGReader.js"/>
                 <file name="particle_nodes/CCTIFFReader.js"/>
                 <file name="particle_nodes/CCParticleSystem.js"/>
@@ -197,10 +195,12 @@
                 <file name="CocoStudio/GUI/UIWidgets/UIButton.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UICheckBox.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UIImageView.js"/>
+                <file name="CocoStudio/GUI/UIWidgets/UIRichText.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UILabel.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UILabelAtlas.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UILabelBMFont.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UILoadingBar.js"/>
+                <file name="CocoStudio/GUI/UIWidgets/UIRichText.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UISlider.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UISwitch.js"/>
                 <file name="CocoStudio/GUI/UIWidgets/UITextField.js"/>

HelloHTML5World/cocos2d.js

@@ -57,8 +57,9 @@
         return;
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-        this.removeEventListener('DOMContentLoaded', arguments.callee, false);
+    var fn;
+    window.addEventListener('DOMContentLoaded', fn = function() {
+        this.removeEventListener('DOMContentLoaded', fn, false);
         //first load engine file if specified
         var s = d.createElement('script');
         /*********Delete this section if you have packed all files into one*******/

HelloHTML5World/index.html

@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <title>Cocos2d-html5 Hello World test</title>
     <link rel="icon" type="image/GIF" href="res/favicon.ico"/>
-    <meta name="viewport" content="user-scalable=no" />
     <meta name="apple-mobile-web-app-capable" content="yes"/>
     <meta name="full-screen" content="yes"/>
     <meta name="screen-orientation" content="portrait"/>

HelloHTML5World/main.js

@@ -40,12 +40,13 @@ var cocos2dApp = cc.Application.extend({
             alert("Browser doesn't support WebGL");
             return false;
         }
-        // initialize director
-        var director = cc.Director.getInstance();
 
         cc.EGLView.getInstance().resizeWithBrowserSize(true);
         cc.EGLView.getInstance().setDesignResolutionSize(800, 450, cc.RESOLUTION_POLICY.SHOW_ALL);
 
+	    // initialize director
+	    var director = cc.Director.getInstance();
+
         // turn on display FPS
         director.setDisplayStats(this.config['showFPS']);
 

HelloHTML5World/src/resource.js

@@ -4,9 +4,9 @@ var s_CloseSelected = "res/CloseSelected.png";
 
 var g_resources = [
     //image
-    {src:s_HelloWorld},
-    {src:s_CloseNormal},
-    {src:s_CloseSelected}
+    s_HelloWorld,
+    s_CloseNormal,
+    s_CloseSelected
 
     //plist
 

cocos2d/CCImage.js

@@ -105,7 +105,7 @@ cc.RGB_PREMULTIPLY_APLHA = function (vr, vg, vb, va) {
  * image source
  * @Class
  * @Construct
- * @param {Array||String} data
+ * @param {Array|String} data
  * @param {Number} size
  * @param {Number} offset
  */

cocos2d/CCNotificationCenter.js

@@ -143,13 +143,7 @@ cc.NotificationObserver = cc.Class.extend({
      * @param {cc.Class} obj
      */
     performSelector:function (obj) {
-        if (this._target && (typeof(this._selector) == "string")) {
-            this._target[this._selector](obj);
-        } else if (this._target && (typeof(this._selector) == "function")) {
-            this._selector.call(this._target, obj);
-        } else {
-            this._selector(obj);
-        }
+        cc.doCallback(this._selector, this._target,obj);
     },
 
     _target:null,

cocos2d/CCUserDefault.js

@@ -266,7 +266,7 @@ cc.UserDefault.getInstance = function () {
  * @return {cc.UserDefault|}
  */
 cc.UserDefault.purgeInstanceUserDefault = function () {
-    if (cc.hasOwnProperty("Browser")) { //TODO: clear() is not implemented in JSB
+    if (cc.Browser) { //TODO: clear() is not implemented in JSB
         if (this._db) {
             this._db.clear();
         }

cocos2d/accelerometer/CCAccelerometer.js

@@ -66,21 +66,24 @@ cc.AccelerometerDispatcher = cc.Class.extend(/** @lends cc.AccelerometerDispatch
     _delegate: null,
     _acceleration: null,
     _deviceEvent: null,
-    _interval: 0,
+    _interval: 1/30,
     _minus: 1,
+    _curTime:0,
     init: function () {
         this._acceleration = new cc.Acceleration();
-        this._deviceEvent = window.DeviceMotionEvent || window.DeviceOrientationEvent;
-        var ua = navigator.userAgent;
-        if (/Android/.test(ua) || (/Adr/.test(ua) && cc.Browser.type == "ucbrowser")) {
-            this._minus = -1;
-        }
+        var w = window;
+        this._deviceEvent = w.DeviceMotionEvent || w.DeviceOrientationEvent;
 
         //TODO fix DeviceMotionEvent bug on QQ Browser version 4.1 and below.
         if (cc.Browser.type == "mqqbrowser") {
             this._deviceEvent = window.DeviceOrientationEvent;
         }
-        return true;
+
+        this._deviceEventType = (this._deviceEvent == w.DeviceMotionEvent) ? "devicemotion" : "deviceorientation";
+        var ua = navigator.userAgent;
+        if (/Android/.test(ua) || (/Adr/.test(ua) && cc.Browser.type == "ucbrowser")) {
+            this._minus = -1;
+        }
     },
 
     getDelegate: function () {
@@ -89,18 +92,13 @@ cc.AccelerometerDispatcher = cc.Class.extend(/** @lends cc.AccelerometerDispatch
 
     addDelegate: function (delegate) {
         this._delegate = delegate;
-        var acc = this.didAccelerate.bind(this);
-
+        var acc = this.didAccelerate.bind(this), w = window, scheduler = cc.Director.getInstance().getScheduler();
         if (this._delegate) {
-            if (this._deviceEvent == window.DeviceMotionEvent)
-                window.addEventListener('devicemotion', acc, false);
-            else
-                window.addEventListener('deviceorientation', acc, false);
+            w.addEventListener(this._deviceEventType, acc, false);
+            scheduler.scheduleUpdateForTarget(this);
         } else {
-            if (this._deviceEvent == window.DeviceMotionEvent)
-                window.removeEventListener('devicemotion', acc);
-            else
-                window.removeEventListener('deviceorientation', acc);
+            w.removeEventListener(this._deviceEventType, acc);
+            scheduler.unscheduleUpdateForTarget(this);
         }
     },
 
@@ -115,48 +113,50 @@ cc.AccelerometerDispatcher = cc.Class.extend(/** @lends cc.AccelerometerDispatch
             return;
         }
 
-        var now = Date.now();
-         if ((now - this._acceleration.timestamp) / 1000 < this._interval) return;
-
+        var mAcceleration = this._acceleration;
         if (this._deviceEvent == window.DeviceMotionEvent) {
-            var acceleration = eventData.accelerationIncludingGravity;
-            this._acceleration.x = this._minus * acceleration.x * 0.1;
-            this._acceleration.y = this._minus * acceleration.y * 0.1;
-            this._acceleration.z = acceleration.z * 0.1;
+            var eventAcceleration = eventData.accelerationIncludingGravity;
+            mAcceleration.x = this._minus * eventAcceleration.x * 0.1;
+            mAcceleration.y = this._minus * eventAcceleration.y * 0.1;
+            mAcceleration.z = eventAcceleration.z * 0.1;
         }
         else {
-            this._acceleration.x = (eventData.gamma / 90) * 0.981;
-            this._acceleration.y = -(eventData.beta / 90) * 0.981;
-            this._acceleration.z = (eventData.alpha / 90) * 0.981;
+            mAcceleration.x = (eventData.gamma / 90) * 0.981;
+            mAcceleration.y = -(eventData.beta / 90) * 0.981;
+            mAcceleration.z = (eventData.alpha / 90) * 0.981;
         }
-        this._acceleration.timestamp = Date.now();
+        mAcceleration.timestamp = eventData.timeStamp || Date.now();
 
-        var tmp = this._acceleration.x;
+        var tmpX = mAcceleration.x;
         switch (window.orientation) {
             case cc.UIInterfaceOrientationLandscapeRight://-90
-                this._acceleration.x = -this._acceleration.y;
-                this._acceleration.y = tmp;
+                mAcceleration.x = -mAcceleration.y;
+                mAcceleration.y = tmpX;
                 break;
 
             case cc.UIInterfaceOrientationLandscapeLeft://90
-                this._acceleration.x = this._acceleration.y;
-                this._acceleration.y = -tmp;
+                mAcceleration.x = mAcceleration.y;
+                mAcceleration.y = -tmpX;
                 break;
 
             case cc.UIInterfaceOrientationPortraitUpsideDown://180
-                this._acceleration.x = -this._acceleration.x
-                this._acceleration.y = -this._acceleration.y;
+                mAcceleration.x = -mAcceleration.x;
+                mAcceleration.y = -mAcceleration.y;
                 break;
 
             case cc.UIInterfaceOrientationPortrait://0
                 break;
         }
-
-        this._delegate.onAccelerometer(this._acceleration);
+    },
+    update:function(dt){
+        if(this._curTime > this._interval){
+            this._curTime -= this._interval;
+            this._delegate.onAccelerometer(this._acceleration);
+        }
+        this._curTime += dt;
     }
 });
 
-
 cc.AccelerometerDispatcher.getInstance = function () {
     if (!this._instance) {
         this._instance = new cc.AccelerometerDispatcher();

cocos2d/actions/CCAction.js

@@ -66,7 +66,7 @@ cc.Action = cc.Class.extend(/** @lends cc.Action# */{
      * @return {object}
      */
     copy:function () {
-        return cc.clone(this);
+        return this.clone();
     },
 
     /**