58 Commits

Author	SHA1	Message	Date
boyu0	082c3d274a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation	2013-12-18 18:05:30 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
Ricardo Quesada	33c4f891a0	Adds 'CC' to renderer files	2013-12-17 18:41:09 -08:00
Ricardo Quesada	d6be81b7a8	The Renderer is not a singleton ... In order to access, you have to get it from the Director `Director::getInstance()->getRenderer()`	2013-12-17 17:50:17 -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
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