15 Commits

Author	SHA1	Message	Date
samuele3hu	e2ed17f69c	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr	2014-03-21 11:28:39 +08:00
samuele3hu	71f3cb7862	close #4452:Make `addCustomHandler` more distinct	2014-03-21 11:24:24 +08:00
James Chen	d5e8bde89e	Merge pull request #5889 from samuele3hu/develop_socket ... close #4400: Use the latest version of LuaSocket and modify the related project config	2014-03-21 10:52:38 +08:00
samuele3hu	11bbeb4a30	close #4452:Using better spelling format	2014-03-20 17:56:33 +08:00
samuele3hu	d3487d2d3c	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +08:00
andyque	cf86fd619f	fix lua bindings warnings	2014-03-20 16:48:12 +08:00
samuele3hu	0026fc2b2a	close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test.	2014-03-20 09:54:38 +08:00
samuele3hu	a1ca3195ce	Rename `addConsoleHandler` to `addCustomHandler`	2014-03-19 17:28:23 +08:00
samuele3hu	a91994f242	Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.	2014-03-19 10:50:11 +08:00
andyque	f6a9824df1	fix win32 compile error	2014-03-11 20:59:35 +08:00
andyque	df7aa27b8b	fix mac lua	2014-03-11 18:48:28 +08:00
andyque	026ef95b07	add lua ui binding	2014-03-11 18:48:27 +08:00
andyque	dcc98ef79f	rename cocos2dx_gui to cocos2dx_ui	2014-03-11 18:48:27 +08:00
samuele3hu	5c33155bc9	fix:Remove some warning about lua.	2014-03-11 17:35:09 +08:00
James Chen	650a88a8b1	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00