55 Commits

Author	SHA1	Message	Date
gzito	e389ae5469	Optimized CCImage and fixed alpha value	2011-12-19 22:56:44 +01:00
dumganhar	8298e0b6ff	Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 ... Conflicts: tests/test.marmalade/test.mkb	2011-12-15 13:03:07 +08:00
gzito	d4ea6d4ef5	Rollback changes about CCDirector::sharedInstance as pointer ... Optimized a little bit CCImage::initWithString Fixed CCApplication::run in order to handle closing Marmalade simulator	2011-12-12 14:50:35 +01:00
styck	b1cdb6543d	Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language ... Added tests for Marmalade and enabled language and font testing	2011-12-11 17:18:01 -08:00
styck	bcf63d0e96	Merged from gitbub.gom/gzito, marmalade support, remove airplay	2011-12-10 20:59:48 -08:00