12 Commits

Author	SHA1	Message	Date
minggo	30f4c94bfb	make a little change to upto-0.99.5	2010-12-23 10:35:09 +08:00
Walzer	dec419be71	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-10 10:34:41 +08:00
minggo	534a55eaa1	issue #220: All tests run on android emulator, but the effect of some tests are wrong	2010-12-06 09:51:21 +08:00
yangws	687fb199fc	issue #233 stop main loop when application enter background. test ok on emulator	2010-12-02 18:44:13 +08:00
minggo	d88b26c4d2	commit AppDelegate.cpp after merging	2010-11-29 15:57:53 +08:00
minggo	7fa8d72076	commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git	2010-11-29 15:54:32 +08:00
minggo	9a2ff2407a	commit the change before merging master of cocos2d-x	2010-11-29 15:08:21 +08:00
natural-law	4d98faabc5	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:49:43 +08:00
Walzer	b4152fa700	fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android	2010-11-27 18:25:31 +08:00
yangws	9346275604	show fps	2010-11-19 03:14:19 +00:00
Ming	31809a3774	issue #208	2010-11-18 06:50:28 +00:00
Walzer	ed7d1ca159	issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them	2010-11-12 09:24:12 +00:00