9 Commits

Author	SHA1	Message	Date
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +08:00
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
CaiWenzhi	3885477276	Remove CCDictionary from GUIReader	2013-12-24 10:41:01 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
samuele3	8a408f9951	Add doxygen comments for the CocoStudio	2013-11-20 12:04:47 +08:00
CaiWenzhi	4f76141c41	optimize guireader	2013-11-11 18:22:14 +08:00
Ricardo Quesada	5faae4a51e	removes exe bit from text files	2013-11-08 11:30:50 -08:00
CaiWenzhi	c69163559b	Move some method from helper to reader	2013-11-07 21:26:56 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00