Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test

CHANGELOG.REMOVED.git-id

@@ -1 +1 @@
-c99c8d91b20225c59166c37ca68977a127181872
+474442e74e1b39c748e79eceb26039d513d9a715

cocos/2d/CCActionInterval.cpp

@@ -1491,12 +1491,22 @@ ScaleTo* ScaleTo::create(float duration, float sx, float sy)
     return scaleTo;
 }
 
+ScaleTo* ScaleTo::create(float duration, float sx, float sy, float sz)
+{
+    ScaleTo *scaleTo = new ScaleTo();
+    scaleTo->initWithDuration(duration, sx, sy, sz);
+    scaleTo->autorelease();
+
+    return scaleTo;
+}
+
 bool ScaleTo::initWithDuration(float duration, float s)
 {
     if (ActionInterval::initWithDuration(duration))
     {
         _endScaleX = s;
         _endScaleY = s;
+        _endScaleZ = s;
 
         return true;
     }
@@ -1510,6 +1520,21 @@ bool ScaleTo::initWithDuration(float duration, float sx, float sy)
     {
         _endScaleX = sx;
         _endScaleY = sy;
+        _endScaleZ = 1.f;
+
+        return true;
+    }
+
+    return false;
+}
+
+bool ScaleTo::initWithDuration(float duration, float sx, float sy, float sz)
+{
+    if (ActionInterval::initWithDuration(duration))
+    {
+        _endScaleX = sx;
+        _endScaleY = sy;
+        _endScaleZ = sz;
 
         return true;
     }
@@ -1521,7 +1546,7 @@ ScaleTo* ScaleTo::clone(void) const
 {
 	// no copy constructor
 	auto a = new ScaleTo();
-	a->initWithDuration(_duration, _endScaleX, _endScaleY);
+	a->initWithDuration(_duration, _endScaleX, _endScaleY, _endScaleZ);
 	a->autorelease();
 	return a;
 }
@@ -1538,8 +1563,10 @@ void ScaleTo::startWithTarget(Node *target)
     ActionInterval::startWithTarget(target);
     _startScaleX = target->getScaleX();
     _startScaleY = target->getScaleY();
+    _startScaleZ = target->getScaleZ();
     _deltaX = _endScaleX - _startScaleX;
     _deltaY = _endScaleY - _startScaleY;
+    _deltaZ = _endScaleZ - _startScaleZ;
 }
 
 void ScaleTo::update(float time)
@@ -1548,6 +1575,7 @@ void ScaleTo::update(float time)
     {
         _target->setScaleX(_startScaleX + _deltaX * time);
         _target->setScaleY(_startScaleY + _deltaY * time);
+        _target->setScaleZ(_startScaleZ + _deltaZ * time);
     }
 }
 
@@ -1567,7 +1595,16 @@ ScaleBy* ScaleBy::create(float duration, float s)
 ScaleBy* ScaleBy::create(float duration, float sx, float sy)
 {
     ScaleBy *scaleBy = new ScaleBy();
-    scaleBy->initWithDuration(duration, sx, sy);
+    scaleBy->initWithDuration(duration, sx, sy, 1.f);
+    scaleBy->autorelease();
+
+    return scaleBy;
+}
+
+ScaleBy* ScaleBy::create(float duration, float sx, float sy, float sz)
+{
+    ScaleBy *scaleBy = new ScaleBy();
+    scaleBy->initWithDuration(duration, sx, sy, sz);
     scaleBy->autorelease();
 
     return scaleBy;
@@ -1577,7 +1614,7 @@ ScaleBy* ScaleBy::clone(void) const
 {
 	// no copy constructor
 	auto a = new ScaleBy();
-    a->initWithDuration(_duration, _endScaleX, _endScaleY);
+    a->initWithDuration(_duration, _endScaleX, _endScaleY, _endScaleZ);
 	a->autorelease();
 	return a;
 }
@@ -1587,11 +1624,12 @@ void ScaleBy::startWithTarget(Node *target)
     ScaleTo::startWithTarget(target);
     _deltaX = _startScaleX * _endScaleX - _startScaleX;
     _deltaY = _startScaleY * _endScaleY - _startScaleY;
+    _deltaZ = _startScaleZ * _endScaleZ - _startScaleZ;
 }
 
 ScaleBy* ScaleBy::reverse() const
 {
-    return ScaleBy::create(_duration, 1 / _endScaleX, 1 / _endScaleY);
+    return ScaleBy::create(_duration, 1 / _endScaleX, 1 / _endScaleY, 1/ _endScaleZ);
 }
 
 //

cocos/2d/CCActionInterval.h

@@ -622,6 +622,9 @@ public:
     /** creates the action with and X factor and a Y factor */
     static ScaleTo* create(float duration, float sx, float sy);
 
+    /** creates the action with X Y Z factor */
+    static ScaleTo* create(float duration, float sx, float sy, float sz);
+
     //
     // Overrides
     //
@@ -637,15 +640,21 @@ protected:
     bool initWithDuration(float duration, float s);
     /** initializes the action with and X factor and a Y factor */
     bool initWithDuration(float duration, float sx, float sy);
+    /** initializes the action with X Y Z factor */
+    bool initWithDuration(float duration, float sx, float sy, float sz);
 
     float _scaleX;
     float _scaleY;
+    float _scaleZ;
     float _startScaleX;
     float _startScaleY;
+    float _startScaleZ;
     float _endScaleX;
     float _endScaleY;
+    float _endScaleZ;
     float _deltaX;
     float _deltaY;
+    float _deltaZ;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(ScaleTo);
@@ -662,6 +671,9 @@ public:
     /** creates the action with and X factor and a Y factor */
     static ScaleBy* create(float duration, float sx, float sy);
 
+    /** creates the action with X Y Z factor */
+    static ScaleBy* create(float duration, float sx, float sy, float sz);
+
     //
     // Overrides
     //

cocos/2d/platform/CCFileUtils.cpp

@@ -742,7 +742,11 @@ void FileUtils::setSearchResolutionsOrder(const std::vector<std::string>& search
 
 void FileUtils::addSearchResolutionsOrder(const std::string &order)
 {
-    _searchResolutionsOrderArray.push_back(order);
+    std::string resOrder = order;
+    if (!resOrder.empty() && resOrder[resOrder.length()-1] != '/')
+        resOrder.append("/");
+        
+    _searchResolutionsOrderArray.push_back(resOrder);
 }
 
 const std::vector<std::string>& FileUtils::getSearchResolutionsOrder()

cocos/scripting/lua-bindings/auto/api/Action.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Action
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#Action] startWithTarget 

cocos/scripting/lua-bindings/auto/api/ActionCamera.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionCamera
+-- @extend ActionInterval
 
 --------------------------------
 -- overload function: setEye(float, float, float)

cocos/scripting/lua-bindings/auto/api/ActionEase.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionEase
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#ActionEase] getInnerAction 

cocos/scripting/lua-bindings/auto/api/ActionInstant.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionInstant
+-- @extend FiniteTimeAction
 
 --------------------------------
 -- @function [parent=#ActionInstant] step 

cocos/scripting/lua-bindings/auto/api/ActionInterval.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionInterval
+-- @extend FiniteTimeAction
 
 --------------------------------
 -- @function [parent=#ActionInterval] getAmplitudeRate 

cocos/scripting/lua-bindings/auto/api/ActionManager.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionManager
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#ActionManager] getActionByTag 

cocos/scripting/lua-bindings/auto/api/ActionTween.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ActionTween
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#ActionTween] initWithDuration 

cocos/scripting/lua-bindings/auto/api/Animate.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Animate
+-- @extend ActionInterval
 
 --------------------------------
 -- overload function: getAnimation()

cocos/scripting/lua-bindings/auto/api/Animation.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Animation
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#Animation] getLoops 

cocos/scripting/lua-bindings/auto/api/AnimationCache.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module AnimationCache
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#AnimationCache] getAnimation 

cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module AnimationFrame
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#AnimationFrame] setSpriteFrame 

cocos/scripting/lua-bindings/auto/api/Armature.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Armature
+-- @extend Node,BlendProtocol,
 
 --------------------------------
 -- @function [parent=#Armature] getBone 

cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ArmatureDisplayData
+-- @extend DisplayData
 
 --------------------------------
 -- @function [parent=#ArmatureDisplayData] create 

cocos/scripting/lua-bindings/auto/api/AssetsManager.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module AssetsManager
+-- @extend Node
 
 --------------------------------
 -- @function [parent=#AssetsManager] setStoragePath 

cocos/scripting/lua-bindings/auto/api/AtlasNode.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module AtlasNode
+-- @extend Node,TextureProtocol,
 
 --------------------------------
 -- @function [parent=#AtlasNode] updateAtlasValues 

cocos/scripting/lua-bindings/auto/api/BatchNode.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module BatchNode
+-- @extend Node
 
 --------------------------------
 -- @function [parent=#BatchNode] init 

cocos/scripting/lua-bindings/auto/api/BezierBy.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module BezierBy
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#BezierBy] startWithTarget 

cocos/scripting/lua-bindings/auto/api/BezierTo.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module BezierTo
+-- @extend BezierBy
 
 --------------------------------
 -- @function [parent=#BezierTo] startWithTarget 

cocos/scripting/lua-bindings/auto/api/Blink.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Blink
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#Blink] create 

cocos/scripting/lua-bindings/auto/api/Bone.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Bone
+-- @extend Node
 
 --------------------------------
 -- @function [parent=#Bone] isTransformDirty 

cocos/scripting/lua-bindings/auto/api/BoneData.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module BoneData
+-- @extend BaseData
 
 --------------------------------
 -- @function [parent=#BoneData] getDisplayData 

cocos/scripting/lua-bindings/auto/api/Button.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Button
+-- @extend Widget
 
 --------------------------------
 -- @function [parent=#Button] getTitleText 

cocos/scripting/lua-bindings/auto/api/CallFunc.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CallFunc
+-- @extend ActionInstant
 
 --------------------------------
 -- @function [parent=#CallFunc] execute 

cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CardinalSplineBy
+-- @extend CardinalSplineTo
 
 --------------------------------
 -- @function [parent=#CardinalSplineBy] startWithTarget 

cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CardinalSplineTo
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#CardinalSplineTo] getPoints 

cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CatmullRomBy
+-- @extend CardinalSplineBy
 
 --------------------------------
 -- @function [parent=#CatmullRomBy] initWithDuration 

cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CatmullRomTo
+-- @extend CardinalSplineTo
 
 --------------------------------
 -- @function [parent=#CatmullRomTo] initWithDuration 

cocos/scripting/lua-bindings/auto/api/CheckBox.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module CheckBox
+-- @extend Widget
 
 --------------------------------
 -- @function [parent=#CheckBox] getSelectedState 

cocos/scripting/lua-bindings/auto/api/ClippingNode.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ClippingNode
+-- @extend Node
 
 --------------------------------
 -- @function [parent=#ClippingNode] isInverted 

cocos/scripting/lua-bindings/auto/api/ComAttribute.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ComAttribute
+-- @extend Component
 
 --------------------------------
 -- @function [parent=#ComAttribute] getFloat 

cocos/scripting/lua-bindings/auto/api/ComAudio.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ComAudio
+-- @extend Component
 
 --------------------------------
 -- @function [parent=#ComAudio] stopAllEffects 

cocos/scripting/lua-bindings/auto/api/ComController.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ComController
+-- @extend Component,InputDelegate,
 
 --------------------------------
 -- @function [parent=#ComController] create 

cocos/scripting/lua-bindings/auto/api/ComRender.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ComRender
+-- @extend Component
 
 --------------------------------
 -- @function [parent=#ComRender] setNode 

cocos/scripting/lua-bindings/auto/api/Component.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Component
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#Component] setEnabled 

cocos/scripting/lua-bindings/auto/api/Control.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Control
+-- @extend Layer
 
 --------------------------------
 -- @function [parent=#Control] setEnabled 

cocos/scripting/lua-bindings/auto/api/ControlButton.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlButton
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlButton] isPushed 

cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlColourPicker
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlColourPicker] setEnabled 

cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlHuePicker
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlHuePicker] setEnabled 

cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlPotentiometer
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlPotentiometer] setPreviousLocation 

cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlSaturationBrightnessPicker
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlSaturationBrightnessPicker] getShadow 

cocos/scripting/lua-bindings/auto/api/ControlSlider.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlSlider
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlSlider] getSelectedThumbSprite 

cocos/scripting/lua-bindings/auto/api/ControlStepper.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlStepper
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlStepper] setMinusSprite 

cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module ControlSwitch
+-- @extend Control
 
 --------------------------------
 -- @function [parent=#ControlSwitch] setEnabled 

cocos/scripting/lua-bindings/auto/api/DelayTime.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module DelayTime
+-- @extend ActionInterval
 
 --------------------------------
 -- @function [parent=#DelayTime] create 

cocos/scripting/lua-bindings/auto/api/DrawNode.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module DrawNode
+-- @extend Node
 
 --------------------------------
 -- @function [parent=#DrawNode] drawQuadraticBezier 

cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBackIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseBackIn] create 

cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBackInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseBackInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBackOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseBackOut] create 

cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBezierAction
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseBezierAction] setBezierParamer 

cocos/scripting/lua-bindings/auto/api/EaseBounce.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBounce
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseBounce] clone 

cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBounceIn
+-- @extend EaseBounce
 
 --------------------------------
 -- @function [parent=#EaseBounceIn] create 

cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBounceInOut
+-- @extend EaseBounce
 
 --------------------------------
 -- @function [parent=#EaseBounceInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseBounceOut
+-- @extend EaseBounce
 
 --------------------------------
 -- @function [parent=#EaseBounceOut] create 

cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCircleActionIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCircleActionIn] create 

cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCircleActionInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCircleActionInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCircleActionOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCircleActionOut] create 

cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCubicActionIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCubicActionIn] create 

cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCubicActionInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCubicActionInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseCubicActionOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseCubicActionOut] create 

cocos/scripting/lua-bindings/auto/api/EaseElastic.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseElastic
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseElastic] setPeriod 

cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseElasticIn
+-- @extend EaseElastic
 
 --------------------------------
 -- overload function: create(cc.ActionInterval)

cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseElasticInOut
+-- @extend EaseElastic
 
 --------------------------------
 -- overload function: create(cc.ActionInterval)

cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseElasticOut
+-- @extend EaseElastic
 
 --------------------------------
 -- overload function: create(cc.ActionInterval)

cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseExponentialIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseExponentialIn] create 

cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseExponentialInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseExponentialInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseExponentialOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseExponentialOut] create 

cocos/scripting/lua-bindings/auto/api/EaseIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseIn
+-- @extend EaseRateAction
 
 --------------------------------
 -- @function [parent=#EaseIn] create 

cocos/scripting/lua-bindings/auto/api/EaseInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseInOut
+-- @extend EaseRateAction
 
 --------------------------------
 -- @function [parent=#EaseInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseOut
+-- @extend EaseRateAction
 
 --------------------------------
 -- @function [parent=#EaseOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuadraticActionIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuadraticActionIn] create 

cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuadraticActionInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuadraticActionInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuadraticActionOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuadraticActionOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuarticActionIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuarticActionIn] create 

cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuarticActionInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuarticActionInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuarticActionOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuarticActionOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuinticActionIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuinticActionIn] create 

cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuinticActionInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuinticActionInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseQuinticActionOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseQuinticActionOut] create 

cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseRateAction
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseRateAction] setRate 

cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseSineIn
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseSineIn] create 

cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseSineInOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseSineInOut] create 

cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EaseSineOut
+-- @extend ActionEase
 
 --------------------------------
 -- @function [parent=#EaseSineOut] create 

cocos/scripting/lua-bindings/auto/api/EditBox.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EditBox
+-- @extend ControlButton,IMEDelegate,
 
 --------------------------------
 -- @function [parent=#EditBox] getText 

cocos/scripting/lua-bindings/auto/api/Event.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module Event
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#Event] isStopped 

cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua

@@ -1,5 +1,6 @@
 
 --------------------------------
 -- @module EventAcceleration
+-- @extend Event
 
 return nil

cocos/scripting/lua-bindings/auto/api/EventCustom.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventCustom
+-- @extend Event
 
 --------------------------------
 -- @function [parent=#EventCustom] getEventName 

cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventDispatcher
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#EventDispatcher] pauseEventListenersForTarget 

cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventKeyboard
+-- @extend Event
 
 --------------------------------
 -- @function [parent=#EventKeyboard] EventKeyboard 

cocos/scripting/lua-bindings/auto/api/EventListener.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListener
+-- @extend Ref
 
 --------------------------------
 -- @function [parent=#EventListener] clone 

cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerAcceleration
+-- @extend EventListener
 
 --------------------------------
 -- @function [parent=#EventListenerAcceleration] clone 

cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerCustom
+-- @extend EventListener
 
 --------------------------------
 -- @function [parent=#EventListenerCustom] clone 

cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerKeyboard
+-- @extend EventListener
 
 --------------------------------
 -- @function [parent=#EventListenerKeyboard] clone 

cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerMouse
+-- @extend EventListener
 
 --------------------------------
 -- @function [parent=#EventListenerMouse] clone 

cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerPhysicsContact
+-- @extend EventListenerCustom
 
 --------------------------------
 -- @function [parent=#EventListenerPhysicsContact] create 

cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerPhysicsContactWithBodies
+-- @extend EventListenerPhysicsContact
 
 --------------------------------
 -- @function [parent=#EventListenerPhysicsContactWithBodies] hitTest 

cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua

@@ -1,6 +1,7 @@
 
 --------------------------------
 -- @module EventListenerPhysicsContactWithGroup
+-- @extend EventListenerPhysicsContact
 
 --------------------------------
 -- @function [parent=#EventListenerPhysicsContactWithGroup] hitTest