Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829

[AUTO]: updating luabinding automatically

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

@@ -87,12 +87,12 @@
 --------------------------------
 -- overload function: initWithString(char, cc.FontDefinition)
 --          
--- overload function: initWithString(char, char, float, size_table, cc.TextHAlignment, cc.TextVAlignment)
+-- overload function: initWithString(char, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment)
 --          
 -- @function [parent=#Texture2D] initWithString
 -- @param self
 -- @param #char char
--- @param #char char
+-- @param #string str
 -- @param #float float
 -- @param #size_table size
 -- @param #cc.TextHAlignment texthalignment

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

@@ -11,26 +11,6 @@
 -- @field [parent=#cc] Console#Console Console preloaded module
 
 
---------------------------------------------------------
--- the cc Action
--- @field [parent=#cc] Action#Action Action preloaded module
-
-
---------------------------------------------------------
--- the cc FiniteTimeAction
--- @field [parent=#cc] FiniteTimeAction#FiniteTimeAction FiniteTimeAction preloaded module
-
-
---------------------------------------------------------
--- the cc Speed
--- @field [parent=#cc] Speed#Speed Speed preloaded module
-
-
---------------------------------------------------------
--- the cc Follow
--- @field [parent=#cc] Follow#Follow Follow preloaded module
-
-
 --------------------------------------------------------
 -- the cc GLProgram
 -- @field [parent=#cc] GLProgram#GLProgram GLProgram preloaded module
@@ -76,6 +56,101 @@
 -- @field [parent=#cc] Node#Node Node preloaded module
 
 
+--------------------------------------------------------
+-- the cc AtlasNode
+-- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module
+
+
+--------------------------------------------------------
+-- the cc LabelAtlas
+-- @field [parent=#cc] LabelAtlas#LabelAtlas LabelAtlas preloaded module
+
+
+--------------------------------------------------------
+-- the cc Director
+-- @field [parent=#cc] Director#Director Director preloaded module
+
+
+--------------------------------------------------------
+-- the cc Timer
+-- @field [parent=#cc] Timer#Timer Timer preloaded module
+
+
+--------------------------------------------------------
+-- the cc Scheduler
+-- @field [parent=#cc] Scheduler#Scheduler Scheduler preloaded module
+
+
+--------------------------------------------------------
+-- the cc FileUtils
+-- @field [parent=#cc] FileUtils#FileUtils FileUtils preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerTouchOneByOne
+-- @field [parent=#cc] EventListenerTouchOneByOne#EventListenerTouchOneByOne EventListenerTouchOneByOne preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerTouchAllAtOnce
+-- @field [parent=#cc] EventListenerTouchAllAtOnce#EventListenerTouchAllAtOnce EventListenerTouchAllAtOnce preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerKeyboard
+-- @field [parent=#cc] EventListenerKeyboard#EventListenerKeyboard EventListenerKeyboard preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventMouse
+-- @field [parent=#cc] EventMouse#EventMouse EventMouse preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerMouse
+-- @field [parent=#cc] EventListenerMouse#EventListenerMouse EventListenerMouse preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventAcceleration
+-- @field [parent=#cc] EventAcceleration#EventAcceleration EventAcceleration preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerAcceleration
+-- @field [parent=#cc] EventListenerAcceleration#EventListenerAcceleration EventListenerAcceleration preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventCustom
+-- @field [parent=#cc] EventCustom#EventCustom EventCustom preloaded module
+
+
+--------------------------------------------------------
+-- the cc EventListenerCustom
+-- @field [parent=#cc] EventListenerCustom#EventListenerCustom EventListenerCustom preloaded module
+
+
+--------------------------------------------------------
+-- the cc Action
+-- @field [parent=#cc] Action#Action Action preloaded module
+
+
+--------------------------------------------------------
+-- the cc FiniteTimeAction
+-- @field [parent=#cc] FiniteTimeAction#FiniteTimeAction FiniteTimeAction preloaded module
+
+
+--------------------------------------------------------
+-- the cc Speed
+-- @field [parent=#cc] Speed#Speed Speed preloaded module
+
+
+--------------------------------------------------------
+-- the cc Follow
+-- @field [parent=#cc] Follow#Follow Follow preloaded module
+
+
 --------------------------------------------------------
 -- the cc SpriteFrame
 -- @field [parent=#cc] SpriteFrame#SpriteFrame SpriteFrame preloaded module
@@ -641,41 +716,11 @@
 -- @field [parent=#cc] CatmullRomBy#CatmullRomBy CatmullRomBy preloaded module
 
 
---------------------------------------------------------
--- the cc AtlasNode
--- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module
-
-
 --------------------------------------------------------
 -- the cc DrawNode
 -- @field [parent=#cc] DrawNode#DrawNode DrawNode preloaded module
 
 
---------------------------------------------------------
--- the cc LabelAtlas
--- @field [parent=#cc] LabelAtlas#LabelAtlas LabelAtlas preloaded module
-
-
---------------------------------------------------------
--- the cc Director
--- @field [parent=#cc] Director#Director Director preloaded module
-
-
---------------------------------------------------------
--- the cc GridBase
--- @field [parent=#cc] GridBase#GridBase GridBase preloaded module
-
-
---------------------------------------------------------
--- the cc Grid3D
--- @field [parent=#cc] Grid3D#Grid3D Grid3D preloaded module
-
-
---------------------------------------------------------
--- the cc TiledGrid3D
--- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module
-
-
 --------------------------------------------------------
 -- the cc LabelTTF
 -- @field [parent=#cc] LabelTTF#LabelTTF LabelTTF preloaded module
@@ -1052,18 +1097,18 @@
 
 
 --------------------------------------------------------
--- the cc EventListenerCustom
+-- the cc GridBase
--- @field [parent=#cc] EventListenerCustom#EventListenerCustom EventListenerCustom preloaded module
+-- @field [parent=#cc] GridBase#GridBase GridBase preloaded module
 
 
 --------------------------------------------------------
--- the cc EventCustom
+-- the cc Grid3D
--- @field [parent=#cc] EventCustom#EventCustom EventCustom preloaded module
+-- @field [parent=#cc] Grid3D#Grid3D Grid3D preloaded module
 
 
 --------------------------------------------------------
--- the cc FileUtils
+-- the cc TiledGrid3D
--- @field [parent=#cc] FileUtils#FileUtils FileUtils preloaded module
+-- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module
 
 
 --------------------------------------------------------
@@ -1146,51 +1191,6 @@
 -- @field [parent=#cc] TileMapAtlas#TileMapAtlas TileMapAtlas preloaded module
 
 
---------------------------------------------------------
--- the cc EventListenerTouchOneByOne
--- @field [parent=#cc] EventListenerTouchOneByOne#EventListenerTouchOneByOne EventListenerTouchOneByOne preloaded module
-
-
---------------------------------------------------------
--- the cc EventListenerTouchAllAtOnce
--- @field [parent=#cc] EventListenerTouchAllAtOnce#EventListenerTouchAllAtOnce EventListenerTouchAllAtOnce preloaded module
-
-
---------------------------------------------------------
--- the cc EventListenerKeyboard
--- @field [parent=#cc] EventListenerKeyboard#EventListenerKeyboard EventListenerKeyboard preloaded module
-
-
---------------------------------------------------------
--- the cc EventMouse
--- @field [parent=#cc] EventMouse#EventMouse EventMouse preloaded module
-
-
---------------------------------------------------------
--- the cc EventListenerMouse
--- @field [parent=#cc] EventListenerMouse#EventListenerMouse EventListenerMouse preloaded module
-
-
---------------------------------------------------------
--- the cc EventAcceleration
--- @field [parent=#cc] EventAcceleration#EventAcceleration EventAcceleration preloaded module
-
-
---------------------------------------------------------
--- the cc EventListenerAcceleration
--- @field [parent=#cc] EventListenerAcceleration#EventListenerAcceleration EventListenerAcceleration preloaded module
-
-
---------------------------------------------------------
--- the cc Timer
--- @field [parent=#cc] Timer#Timer Timer preloaded module
-
-
---------------------------------------------------------
--- the cc Scheduler
--- @field [parent=#cc] Scheduler#Scheduler Scheduler preloaded module
-
-
 --------------------------------------------------------
 -- the cc Component
 -- @field [parent=#cc] Component#Component Component preloaded module

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id

@@ -1 +1 @@
-b20d1ed62b7d1c67f012dec501cb0e5689a2663c
+0de0678d6c9c9e08d20c3775bf99531def80654a