11 Commits

Author	SHA1	Message	Date
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
minggo	0e9b43248c	Merge pull request #4728 from dabingnn/develop_removeCommandPool ... Develop remove command pool	2013-12-29 21:53:12 -08:00
James Chen	febc19ea8d	Some warning fixes on linux.	2013-12-26 23:06:16 -08:00
boyu0	2fb0179293	change QuadCommand variable to class member.	2013-12-26 16:36:03 +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
Ricardo Quesada	dd68eb4796	ParticleSystem uses protected constructors	2013-11-14 16:21:49 -08:00
James Chen	0151ac60ba	fix 64bit warning. unsigned int (int) —> long.	2013-11-11 16:45:44 +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	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00