12 Commits

Author	SHA1	Message	Date
minggo	1275d03c77	add override	2014-01-07 16:30:12 +08:00
minggo	6bb4f9822a	ActionProgress has fade and tint effect	2014-01-07 16:23:58 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	6bc0a7066f	change CustomCommand variable to class member.	2013-12-26 21:19:12 +08:00
boyu0	ef54ed3c15	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD ... Conflicts: cocos/2d/CCLabel.cpp cocos/2d/CCLabel.h cocos/2d/CCLabelBMFont.cpp cocos/2d/CCLabelBMFont.h cocos/2d/CCLayer.cpp cocos/2d/CCLayer.h cocos/2d/CCNode.cpp extensions/GUI/CCControlExtension/CCControl.cpp extensions/GUI/CCControlExtension/CCControlButton.cpp extensions/GUI/CCControlExtension/CCScale9Sprite.cpp tools/tojs/cocos2dx.ini	2013-12-19 17:05:59 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
boyu0	7cbce905bf	issue #3162: delete duplicate functions.	2013-12-11 16:12:14 +08:00
Ricardo Quesada	ee0ef6bf46	ProgressTimer works OK ... Adds _modelViewTransform as ivar of Node (temporary fix)	2013-12-06 17:42:16 -08:00
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
Ricardo Quesada	17a6575bd3	more protected constructors ... Adds protected constructors for: * ClippingNode * ParallaxNode * RenderTexture * TMXTiledMap	2013-11-14 16:33:43 -08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00