8 Commits

Author	SHA1	Message	Date
natural-law	25e9721678	fix bugs.	2011-01-04 17:46:23 +08:00
Walzer	5c858b182c	issue #243, fix warnings	2010-12-18 12:02:57 +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
natural-law	3a0ae951b7	fixed #236 Fix the bug of cross-compile in cocos2d-uphone	2010-12-03 11:08:30 +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
natural-law	b1d3e66e68	1. Check the return value of FileData::getFileData() ... 2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile() 3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.	2010-11-29 14:21:33 +08:00
natural-law	94c9addace	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:55:32 +08:00