Commit Graph

8 Commits

Author SHA1 Message Date
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
boyu0 6e6ccbd5f9 change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
James Chen 08edcca9be issue : small fix in ccTypes.h 2013-12-17 15:39:35 +08:00
Nite Luo a70cad8c97 Merge branch 'develop' into newRenderer 2013-11-14 10:36:43 -08:00
Michael Contento 0160bec3ad Colors are now compare- and explicit convertible 2013-11-07 18:13:33 +01:00
Nite Luo 3108d499e5 use placeholder logic to generate material id 2013-11-06 14:24:56 -08:00
minggo 95acb1b9e3 issue : helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 49d7bbd600 issue : remove sub folders except platform 2013-10-12 15:41:45 +08:00