9 Commits

Author	SHA1	Message	Date
boyu0	af5f496861	issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.	2013-12-06 18:07:16 +08:00
hanson	d650c0a6a1	add gui namespace before SEL_TouchEvent	2013-11-26 17:03:01 +08:00
samuele3	07ea8647c3	Add doxygen comments for the CocoStudio	2013-11-20 15:07:34 +08:00
samuele3	8a408f9951	Add doxygen comments for the CocoStudio	2013-11-20 12:04:47 +08:00
CaiWenzhi	a0f794b7df	optimize layout	2013-11-08 23:26:44 +08:00
CaiWenzhi	da27169d45	add "setUserObject" method	2013-11-08 14:58:20 +08:00
CaiWenzhi	9f2297a5a6	add "retain" to listeners	2013-11-07 16:46:41 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00