Merge pull request #5912 from CocosRobot/update_lua_bindings_1395385232

[AUTO]: updating luabinding automatically
This commit is contained in:
James Chen 2014-03-21 15:16:23 +08:00
commit 8ee911adbc
3 changed files with 19 additions and 2 deletions

View File

@ -27,6 +27,11 @@
-- @function [parent=#Label] disableEffect
-- @param self
--------------------------------
-- @function [parent=#Label] getTextColor
-- @param self
-- @return color4B_table#color4B_table ret (return value: color4B_table)
--------------------------------
-- @function [parent=#Label] getCommonLineHeight
-- @param self
@ -144,6 +149,11 @@
-- @param self
-- @return TextVAlignment#TextVAlignment ret (return value: cc.TextVAlignment)
--------------------------------
-- @function [parent=#Label] setTextColor
-- @param self
-- @param #color4B_table color4b
--------------------------------
-- @function [parent=#Label] setHeight
-- @param self
@ -157,7 +167,7 @@
--------------------------------
-- @function [parent=#Label] enableGlow
-- @param self
-- @param #color3B_table color3b
-- @param #color4B_table color4b
--------------------------------
-- @function [parent=#Label] getLetter
@ -298,6 +308,11 @@
-- @param self
-- @param #float float
--------------------------------
-- @function [parent=#Label] updateDisplayedOpacity
-- @param self
-- @param #unsigned char char
--------------------------------
-- @function [parent=#Label] setScaleY
-- @param self

View File

@ -1 +1 @@
d8492e1fa5e40ed580ccbe9f0e7b97b636dfd504
9051708a178a924988d74ec62994d615f1882a3c

View File

@ -1541,6 +1541,8 @@ int register_all_cocos2dx(lua_State* tolua_S);