61 Commits

Author	SHA1	Message	Date
boyu0	c6cc77e75b	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation	2013-12-19 09:45:21 +08:00
Ricardo Quesada	903844c7bd	Removes unneeded files ... New functionality is merged into the 'official' classes	2013-12-18 11:44:45 -08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
boyu0	4d0e3dbd8d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-06 18:16:26 +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
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
James Chen	0151ac60ba	fix 64bit warning. unsigned int (int) —> long.	2013-11-11 16:45:44 +08:00
Huabing.Xu	99bcca0532	issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder	2013-11-07 19:11:09 +08:00
Ricardo Quesada	ddb0111392	continue replacing `const char*` with `const std::string&` ... This patch includes: * Continue replacing `const char*` with `const std::string&` where it makes sense. * It also removes some Hungarian notation from the code. * It fixes some indentation issues in part of the code * It replaces `int` or `unsigned int` with `long` where it makes sense.	2013-11-06 17:05:13 -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