Merge pull request #5695 from CocosRobot/update_lua_bindings_1394595012

[AUTO]: updating luabinding automatically

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

@@ -24,6 +24,16 @@
 -- @param self
 -- @return string#string ret (return value: string)
         
+--------------------------------
+-- @function [parent=#LabelTTF] setFlippedY 
+-- @param self
+-- @param #bool bool
+        
+--------------------------------
+-- @function [parent=#LabelTTF] setFlippedX 
+-- @param self
+-- @param #bool bool
+        
 --------------------------------
 -- @function [parent=#LabelTTF] setTextDefinition 
 -- @param self
@@ -52,13 +62,7 @@
 -- @param #string str
         
 --------------------------------
--- overload function: initWithString(string, string, float, size_table, cc.TextHAlignment)
+-- @function [parent=#LabelTTF] initWithString 
---          
--- overload function: initWithString(string, string, float)
---          
--- overload function: initWithString(string, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment)
---          
--- @function [parent=#LabelTTF] initWithString
 -- @param self
 -- @param #string str
 -- @param #string str
@@ -66,11 +70,6 @@
 -- @param #size_table size
 -- @param #cc.TextHAlignment texthalignment
 -- @param #cc.TextVAlignment textvalignment
--- @return bool#bool ret (retunr value: bool)
-
---------------------------------
--- @function [parent=#LabelTTF] init 
--- @param self
 -- @return bool#bool ret (return value: bool)
         
 --------------------------------
@@ -79,6 +78,11 @@
 -- @param #color3B_table color3b
 -- @param #bool bool
         
+--------------------------------
+-- @function [parent=#LabelTTF] getBlendFunc 
+-- @param self
+-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc)
+        
 --------------------------------
 -- @function [parent=#LabelTTF] enableStroke 
 -- @param self
@@ -111,6 +115,11 @@
 -- @param self
 -- @return FontDefinition#FontDefinition ret (return value: cc.FontDefinition)
         
+--------------------------------
+-- @function [parent=#LabelTTF] setBlendFunc 
+-- @param self
+-- @param #cc.BlendFunc blendfunc
+        
 --------------------------------
 -- @function [parent=#LabelTTF] getFontName 
 -- @param self
@@ -130,14 +139,10 @@
 -- @param self
         
 --------------------------------
--- overload function: create(string, string, float, size_table, cc.TextHAlignment)
+-- overload function: create()
---          
--- overload function: create(string, string, float)
 --          
 -- overload function: create(string, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment)
 --          
--- overload function: create()
---          
 -- @function [parent=#LabelTTF] create
 -- @param self
 -- @param #string str

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

@@ -671,11 +671,6 @@
 -- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module
 
 
---------------------------------------------------------
--- the cc Sprite
--- @field [parent=#cc] Sprite#Sprite Sprite preloaded module
-
-
 --------------------------------------------------------
 -- the cc LabelTTF
 -- @field [parent=#cc] LabelTTF#LabelTTF LabelTTF preloaded module
@@ -956,6 +951,11 @@
 -- @field [parent=#cc] MotionStreak#MotionStreak MotionStreak preloaded module
 
 
+--------------------------------------------------------
+-- the cc Sprite
+-- @field [parent=#cc] Sprite#Sprite Sprite preloaded module
+
+
 --------------------------------------------------------
 -- the cc ProgressTimer
 -- @field [parent=#cc] ProgressTimer#ProgressTimer ProgressTimer preloaded module

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

@@ -1,6 +1,16 @@
 --------------------------------
 -- @module cc
 
+--------------------------------------------------------
+-- the cc PhysicsWorld
+-- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module
+
+
+--------------------------------------------------------
+-- the cc PhysicsDebugDraw
+-- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module
+
+
 --------------------------------------------------------
 -- the cc PhysicsShape
 -- @field [parent=#cc] PhysicsShape#PhysicsShape PhysicsShape preloaded module
@@ -46,16 +56,6 @@
 -- @field [parent=#cc] PhysicsBody#PhysicsBody PhysicsBody preloaded module
 
 
---------------------------------------------------------
--- the cc PhysicsWorld
--- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module
-
-
---------------------------------------------------------
--- the cc PhysicsDebugDraw
--- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module
-
-
 --------------------------------------------------------
 -- the cc PhysicsContact
 -- @field [parent=#cc] PhysicsContact#PhysicsContact PhysicsContact preloaded module

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

@@ -1 +1 @@
-d138e71bc4c559cac2e5948ecddff242d950646e
+5b99d1a1621323c9e0f9eda1a5535280bec64f1f

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

@@ -1544,6 +1544,9 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
 
 
 

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

@@ -1 +1 @@
-9ee0235aac42ea657853d56947716b3fc8fee2c2
+6deb0e9e9ec193559f4eaa0f48310265bc32a491