9 Commits

Author	SHA1	Message	Date
samuele3hu	555ef20202	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic ... Conflicts: cocos/scripting/lua/bindings/LuaBasicConversions.h cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp	2014-02-21 10:10:20 +08:00
samuele3hu	3532665520	issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object	2014-02-21 09:45:33 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
samuele3hu	35d031ea06	issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module	2014-01-17 10:19:56 +08:00
samuele3hu	2cbe502113	issue #3643:Lua websocket can't receive more than 64 bytes of data	2014-01-09 17:23:22 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
samuele3hu	6d8deac8a8	issue #3374:Register the lua manual binding funtions leading to the top index of lua state	2013-12-11 12:05:46 +08:00
James Chen	225738ecc5	issue #2905: [iOS Mac] HelloLua and TestLua work now.	2013-10-16 17:19:02 +08:00
James Chen	352d1f6768	issue #2905: Renaming lua/cocos2dx_support to lua/bindings.	2013-10-16 16:40:07 +08:00