14 Commits

Author	SHA1	Message	Date
samuele3	ec9bc0069f	Modify template of lua ios_mac config and some bugs	2013-11-15 13:48:34 +08:00
samuele3	babc985409	Add deprecated functions of class TextureCache	2013-11-14 14:12:25 +08:00
samuele3	17f74eeb17	issue #2868:Modify armature test samples and add more armature test samples	2013-11-13 18:18:29 +08:00
samuele3	482ee5d47f	issue #2868:Add more ccs lua test samples	2013-11-12 15:25:47 +08:00
samuele3	06c7d3e96d	issue #2868:Add ccd lua test samples	2013-11-11 17:03:43 +08:00
Ricardo Quesada	5faae4a51e	removes exe bit from text files	2013-11-08 11:30:50 -08:00
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	4031556398	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj samples/Lua/TestLua/Resources/luaScript/mainMenu.lua	2013-10-31 21:57:24 +08:00
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