61 Commits

Author	SHA1	Message	Date
samuele3hu	0daa30419b	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp tools/tolua/cocos2dx.ini	2014-08-06 00:37:19 +08:00
samuele3hu	da18657f4f	Add module Android.mk config and adjust related test cases	2014-08-05 13:29:54 +08:00
samuele3hu	cd0c82f8b7	Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates	2014-08-04 17:11:57 +08:00
samuele3hu	e5f9c1b488	Adjust common script and related test cases	2014-08-04 15:22:07 +08:00
samuele3hu	6f4cafcc1b	Add module register functions and adjust iOS and Mac test cases	2014-08-04 09:39:42 +08:00
huangshiwu	ef69faf3ba	GLView Hook	2014-07-31 00:53:04 +08:00
Dhilan007	6429cf06fb	update test case of game controller[lua]	2014-07-17 11:26:26 +08:00
samuele3hu	82070e5205	Remove glView setting form cpp to lua script	2014-07-11 15:34:56 +08:00
samuele3hu	2cbe262842	Add newline for some files	2014-07-11 12:00:43 +08:00
samuele3hu	dd76ae93f6	Update controller lua binding and related test cases	2014-07-11 11:52:05 +08:00
samuele3hu	3546c131dd	Add Lua bindings for controller and related test case project	2014-07-09 18:05:02 +08:00