56 Commits

Author	SHA1	Message	Date
samuelhu	7c45ddafe2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-10-31 17:22:14 +08:00
samuelhu	faf3b30e9b	issue #3069:Add LuaObjectCBridge and related test sample	2013-10-31 15:20:53 +08:00
samuelhu	c08a09a7e0	#3049:Add LICENSE_JSON4LUA and some constant values.	2013-10-30 10:52:04 +08:00
samuelhu	a4d028e905	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 11:40:41 +08:00
samuelhu	be1f17ca0f	issue #3037:Add assetsmananger lua binding and a releated test sample	2013-10-22 16:14:49 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00