12 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	e5f9c1b488	Adjust common script and related test cases	2014-08-04 15:22:07 +08:00
huangshiwu	ef69faf3ba	GLView Hook	2014-07-31 00:53:04 +08:00
samuele3hu	9c7999d1c2	Fix the tests-lua crash on windows platform	2014-07-11 18:13:08 +08:00
samuele3hu	82070e5205	Remove glView setting form cpp to lua script	2014-07-11 15:34:56 +08:00
samuele3hu	d9848a62d2	Update controller.lua for CocosIDE’s need	2014-06-20 11:09:26 +08:00
samuele3hu	5ab8b81205	Update control.lua for lua-tests	2014-06-06 11:42:18 +08:00
samuele3hu	919524cf89	Update controller.lua for lua-tests and bindings-generator submoudle	2014-06-05 14:39:09 +08:00
samuele3hu	dc03571076	fix some bugs for lua-tests	2014-05-23 16:48:18 +08:00
samuele3hu	f76e2a5476	Readd the lua binding for `visit` and modify a requirement for IDE	2014-05-23 10:00:59 +08:00
samuele3hu	a6efd4f650	Move `setSearchPat` operation from cpp to script	2014-05-22 14:00:39 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00