11 Commits

Author	SHA1	Message	Date
boyu0	8e329501ba	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string ... Conflicts: cocos/2d/renderer/CCNewSprite.cpp cocos/2d/renderer/CCNewSprite.h cocos/2d/renderer/CCNewTextureAtlas.cpp cocos/2d/renderer/CCNewTextureAtlas.h	2013-12-24 11:44:08 +08:00
boyu0	3344c5243c	change some const char* to const std::string&	2013-12-24 10:51:47 +08:00
James Chen	ed93f90ccc	Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.	2013-12-23 16:58:26 +08:00
James Chen	ed93c114e5	Reverts CCSpriteBatchNode.h	2013-12-13 16:47:42 +08:00
James Chen	bb5ef615dd	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 ... Conflicts: cocos/2d/CCSpriteBatchNode.h	2013-12-13 16:44:22 +08:00
Ricardo Quesada	a8c317bd83	getDescription() works as expected ... renames `description` to `getDescription`. Adds `virtual` to it. Adds `getDescription` to missing nodes.	2013-12-12 14:30:22 -08:00
minggo	1e9c763b40	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -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