12 Commits

Author	SHA1	Message	Date
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
CaiWenzhi	767bf81e90	Modify renderers draw order define.	2014-01-03 15:46:42 +08:00
CaiWenzhi	d8a5fd6af4	Modify wrong codes	2013-12-27 18:23:53 +08:00
CaiWenzhi	b2da9d2da5	Fixed bugs	2013-12-27 17:58:00 +08:00
CaiWenzhi	c516860017	Fixed bugs about color and opacity	2013-12-25 18:30:21 +08:00
CaiWenzhi	0dac69523c	Remove "_renderer" from widget	2013-12-24 20:22:14 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
Ricardo Quesada	cd0ba6850c	Merge branch 'develop' into constructors_are_protected	2013-11-14 11:57:18 -08:00
CaiWenzhi	611ba9e9f5	Modify code criterion	2013-11-14 11:37:46 +08:00
Ricardo Quesada	d590986e73	Constructors are protected	2013-11-13 15:55:36 -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