12 Commits

Author	SHA1	Message	Date
James Chen	2133c0e566	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode ... Conflicts: cocos/2d/CCDrawNode.h	2014-01-09 17:03:08 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
James Chen	cf006df9ff	closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.	2013-12-31 10:54:37 +08:00
boyu0	6bc0a7066f	change CustomCommand variable to class member.	2013-12-26 21:19:12 +08:00
Ricardo Quesada	903844c7bd	Removes unneeded files ... New functionality is merged into the 'official' classes	2013-12-18 11:44:45 -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
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
ThePickleMan	870f7de357	Readded trimmed semicolon	2013-10-13 23:12:41 -05:00
PickleMan	01ebb2ac29	Added triangle, quad bezier, cubic bezier drawing to DrawNode	2013-10-13 23:41:55 -04:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00