Merge pull request #6548 from CocosRobot/update_lua_bindings_1398990974

[AUTO]: updating luabinding automatically
This commit is contained in:
Ricardo Quesada 2014-05-01 17:52:17 -07:00
commit 49045d81cc
7 changed files with 34 additions and 22 deletions

View File

@ -3,26 +3,11 @@
-- @module Layer -- @module Layer
-- @extend Node -- @extend Node
--------------------------------
-- @function [parent=#Layer] updatePhysics
-- @param self
-- @param #float float
--------------------------------
-- @function [parent=#Layer] getPhysicsWorld
-- @param self
-- @return PhysicsWorld#PhysicsWorld ret (return value: cc.PhysicsWorld)
-------------------------------- --------------------------------
-- @function [parent=#Layer] create -- @function [parent=#Layer] create
-- @param self -- @param self
-- @return Layer#Layer ret (return value: cc.Layer) -- @return Layer#Layer ret (return value: cc.Layer)
--------------------------------
-- @function [parent=#Layer] createWithPhysics
-- @param self
-- @return Layer#Layer ret (return value: cc.Layer)
-------------------------------- --------------------------------
-- @function [parent=#Layer] getDescription -- @function [parent=#Layer] getDescription
-- @param self -- @param self

View File

@ -3,15 +3,20 @@
-- @module PhysicsWorld -- @module PhysicsWorld
-------------------------------- --------------------------------
-- @function [parent=#PhysicsWorld] setGravity -- @function [parent=#PhysicsWorld] getGravity
-- @param self -- @param self
-- @param #cc.math::Vector2 array -- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-------------------------------- --------------------------------
-- @function [parent=#PhysicsWorld] getAllBodies -- @function [parent=#PhysicsWorld] getAllBodies
-- @param self -- @param self
-- @return array_table#array_table ret (return value: array_table) -- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsWorld] setGravity
-- @param self
-- @param #cc.math::Vector2 array
-------------------------------- --------------------------------
-- @function [parent=#PhysicsWorld] getSpeed -- @function [parent=#PhysicsWorld] getSpeed
-- @param self -- @param self
@ -68,9 +73,9 @@
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#PhysicsWorld] getGravity -- @function [parent=#PhysicsWorld] getScene
-- @param self -- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2) -- @return Scene#Scene ret (return value: cc.Scene)
-------------------------------- --------------------------------
-- @function [parent=#PhysicsWorld] setDebugDrawMask -- @function [parent=#PhysicsWorld] setDebugDrawMask

View File

@ -3,11 +3,21 @@
-- @module Scene -- @module Scene
-- @extend Node -- @extend Node
--------------------------------
-- @function [parent=#Scene] getPhysicsWorld
-- @param self
-- @return PhysicsWorld#PhysicsWorld ret (return value: cc.PhysicsWorld)
-------------------------------- --------------------------------
-- @function [parent=#Scene] create -- @function [parent=#Scene] create
-- @param self -- @param self
-- @return Scene#Scene ret (return value: cc.Scene) -- @return Scene#Scene ret (return value: cc.Scene)
--------------------------------
-- @function [parent=#Scene] createWithPhysics
-- @param self
-- @return Scene#Scene ret (return value: cc.Scene)
-------------------------------- --------------------------------
-- @function [parent=#Scene] getDescription -- @function [parent=#Scene] getDescription
-- @param self -- @param self
@ -18,4 +28,16 @@
-- @param self -- @param self
-- @return Scene#Scene ret (return value: cc.Scene) -- @return Scene#Scene ret (return value: cc.Scene)
--------------------------------
-- @function [parent=#Scene] update
-- @param self
-- @param #float float
--------------------------------
-- @function [parent=#Scene] addChild
-- @param self
-- @param #cc.Node node
-- @param #int int
-- @param #int int
return nil return nil

View File

@ -1 +1 @@
0de0678d6c9c9e08d20c3775bf99531def80654a 386e6619a3dd4ab1afa2a66944aa4ced9b12960c

View File

@ -1565,7 +1565,6 @@ int register_all_cocos2dx(lua_State* tolua_S);
#endif // __cocos2dx_h__ #endif // __cocos2dx_h__

View File

@ -1 +1 @@
549fefb3c45c97c9e6f963ed72c8386437cb4dc9 8a49e1e092b844f369715d9f7d98a458d0f89d3c

View File

@ -262,6 +262,7 @@ int register_all_cocos2dx_physics(lua_State* tolua_S);
#endif // __cocos2dx_physics_h__ #endif // __cocos2dx_physics_h__