5 Commits

Author	SHA1	Message	Date
samuele3	80f3a7d57a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h cocos/scripting/lua/script/Cocos2dConstants.lua	2013-11-01 17:17:21 +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
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