66 Commits

Author	SHA1	Message	Date
samuelhu	3508213615	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-10-29 11:45:19 +08:00
samuelhu	a4d028e905	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 11:40:41 +08:00
samuelhu	d7689073e0	issue #3049:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-24 11:12:21 +08:00
samuelhu	26caaa0a36	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager	2013-10-23 09:57:21 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
samuelhu	5f769b2313	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager	2013-10-22 16:52:44 +08:00
samuelhu	be1f17ca0f	issue #3037:Add assetsmananger lua binding and a releated test sample	2013-10-22 16:14:49 +08:00
Dhilan007	f11dba586a	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
dualface	8f2f524f2d	fix tolua_fix, cleanup peertable after object deleted	2013-10-18 11:30:28 +08:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +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
James Chen	f6275667bf	Removing unused ios projects.	2013-10-12 15:02:28 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00