10 Commits

Author	SHA1	Message	Date
James Chen	230b8a386b	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' ... with four spaces. Also, 1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead of }. 2. Removed some unused files. 3. Renamed the name of some folders, for example, "test.android"-->"proj.android" .	2012-04-19 14:35:52 +08:00
James Chen	84ffaf130a	delete semicolon after NS_CC_BEGIN and NS_CC_END	2012-04-19 11:56:22 +08:00
James Chen	f529bcd659	issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector.	2012-03-21 17:35:20 +08:00
gzito	f40d3d3db8	Changed use of animation interval in game loop	2012-01-24 23:27:03 +01:00
gzito	b400570265	Workaround for issue #635. Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator	2012-01-17 10:57:31 +01:00
gzito	e3c5d6886e	Added authors info	2011-12-19 22:57:04 +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