8 Commits

Author	SHA1	Message	Date
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	c69163559b	Move some method from helper to reader	2013-11-07 21:26:56 +08:00
CaiWenzhi	af5ab02bc7	temp commit	2013-11-07 14:00:51 +08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
samuele3	b445f0824a	issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples	2013-11-05 15:09:51 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00