7 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	fdac224a7b	issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace	2014-01-17 10:19:55 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
samuele3hu	cdc82d6e8c	Add a newline	2014-01-03 10:50:06 +08:00
samuele3hu	07a3efb585	Update the lua test cases about the GUI	2014-01-03 10:39:19 +08:00