James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h		2013-09-16 18:18:23 +08:00
..
Images	issue #2782: shadertestSprite add lensFlare Sprite Test Case	2013-09-12 10:25:55 +08:00
Misc	issue #1683: Adding FileUtilsTest.	2013-01-28 15:17:20 +08:00
Shaders	issue #2277: Add OpenGL lua test samples	2013-06-19 16:40:02 +08:00
TileMaps	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
animations	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
armature	fix armature hd crash	2013-09-14 23:31:33 +08:00
ccb	fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.	2013-03-19 16:33:23 +08:00
extensions	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
fonts	fix bugs with new Label stuff and add new sample for unicode	2013-07-30 16:41:26 -07:00
hd	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop	2013-09-16 18:18:23 +08:00
ipad	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
scenetest	1. update scenetest version.	2013-09-14 20:49:02 +08:00
.gitignore	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
Hello.png.REMOVED.git-id	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
app.icf	Marmalade projects fix.	2013-06-06 14:26:35 +08:00
background-music-aac.wav.REMOVED.git-id	1. add Component struct.	2013-06-04 17:38:43 +08:00
background.mp3.REMOVED.git-id	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
development.icf	Marmalade projects fix.	2013-06-06 14:26:35 +08:00