Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
andyque 2014-03-20 10:43:31 +08:00
parent abc88ecc6a 0160d55349
commit 6b042d26da
311 changed files with 374 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.REMOVED.git-id
View File

@ -1 +1 @@
c99c8d91b20225c59166c37ca68977a127181872
474442e74e1b39c748e79eceb26039d513d9a715

46
cocos/2d/CCActionInterval.cpp
View File

@ -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);
}
//

12
cocos/2d/CCActionInterval.h
View File

@ -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
//

6
cocos/2d/platform/CCFileUtils.cpp
View File

@ -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()

1
cocos/scripting/lua-bindings/auto/api/Action.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionCamera.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionEase.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionInstant.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionInterval.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionManager.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ActionTween.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Animate.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Animation.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/AnimationCache.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Armature.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/AssetsManager.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/AtlasNode.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/BatchNode.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/BezierBy.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/BezierTo.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Blink.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Bone.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/BoneData.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Button.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CallFunc.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/CheckBox.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ClippingNode.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ComAttribute.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ComAudio.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ComController.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ComRender.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Component.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Control.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlButton.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlSlider.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlStepper.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/DelayTime.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/DrawNode.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBounce.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseElastic.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EditBox.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/Event.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventCustom.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListener.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua
View File

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

1
cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua
View File

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

Some files were not shown because too many files have changed in this diff Show More