18 Commits

Author	SHA1	Message	Date
Giovanni Zito	0c1b058629	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:16:32 +01:00
Giovanni Zito	b60eac2505	integrating libXml2	2011-12-07 23:49:52 +01:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
minggo	d48da20b0f	synchrolize to master	2011-11-18 18:53:53 +08:00
minggo	5273819e83	offer a thread safe function to read contents of xml file, and the engine use it internal	2011-11-15 10:41:18 +08:00
dumganhar	c94adc58b9	changed bada projects directory, add bada macro	2011-09-19 17:53:45 +08:00
natural-law	214e86a5b6	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/platform/CCFileUtils.cpp	2011-06-14 15:05:52 +08:00
natural-law	489fb7824b	fixed #524, Parse the special format of plist files.	2011-06-14 14:53:00 +08:00
liswei	1591c7edc8	fixed #512 fix warnings in /Wall flag	2011-06-10 17:51:37 +08:00
minggo	7d52161804	fixed #441: Initialize pointer in contruction & detect pointer value in destruction	2011-04-01 16:06:53 +08:00
walzer	70eb85e6df	Merge branch 'yangws-439'	2011-03-30 11:47:10 +08:00
yangws	7e81c56231	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 ... Conflicts: cocos2dx/platform/ios/CCFileUtils_ios.mm	2011-03-30 11:05:23 +08:00
natural-law	87ea85a986	fixed #411,support .plist format generated by zwoptex in the last version.	2011-03-29 16:59:50 +08:00
natural-law	5f7357bf09	fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.	2011-03-29 11:56:14 +08:00
yangws	041953151a	issue #439 CCFileData and imageWithImageFile modified on win32.	2011-03-29 11:41:44 +08:00
natural-law	ed2566e201	issue #434,Refactor class CCFileUtils on platform airplay.	2011-03-28 16:27:26 +08:00
natural-law	cee82fe9fa	issue #434,refactor class CCFileUtils on android and ios.	2011-03-26 17:24:37 +08:00
natural-law	28a940ab57	issue #434,refactor class CCFileUtils on win32 and wophone.	2011-03-26 13:52:33 +08:00