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

Merge pull request #6017 from CocosRobot/update_lua_bindings_1395899624 

[AUTO]: updating luabinding automatically
This commit is contained in:
James Chen 2014-03-27 13:59:33 +08:00
parent e52fc981cc 33d6b04fb4
commit 18ce311011
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/scripting/lua-bindings/auto/api/GLProgram.lua
View File

@ -53,6 +53,11 @@
-- @param self -- @param self
-- @param #kmMat4 kmmat4 -- @param #kmMat4 kmmat4
--------------------------------
-- @function [parent=#GLProgram] getMaterialProgramID
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith3i -- @function [parent=#GLProgram] setUniformLocationWith3i
-- @param self -- @param self

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

@ -1 +1 @@
2b4d7967b19a02138c89b1c3ed7fc4682267a47a 3bcfacd1a43c62b8fb2af30248a05444f00a8027

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

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