10 Commits

Author	SHA1	Message	Date
chengstory	e4e22b52cb	Merge branch 'develop' into #3456 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCDataReaderHelper.cpp cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp	2013-12-24 22:05:13 +08:00
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
yinkaile	44e22584a4	fixed getFileData	2013-12-24 13:35:46 +08:00
yinkaile	ba809a0096	change const char* to const std::string&	2013-12-23 14:05:46 +08:00
samuele3	8a408f9951	Add doxygen comments for the CocoStudio	2013-11-20 12:04:47 +08:00
2youyou2	3eef64c3b8	1. Change NULL to null ... 2. Remove CocoStudio/Armature files	2013-11-05 15:32:13 +08:00
2youyou2	25196072f2	1. change color json format ... 2. fix tween easing 3. fix CCBone crate bug	2013-11-05 11:57:20 +08:00
2youyou2	005d3c0121	1. fix if frame event is at the last frame, it may emit event several times ... 2. add method for removing single data info 3. add test TEST_DIRECT_LOADING 4. add test TEST_FRAME_EVENT 5. add method for getting calculated collider vertex	2013-10-31 17:28:14 +08:00
yinkaile	8fa8b9f844	update develop	2013-10-30 09:41:40 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00