7 Commits

Author	SHA1	Message	Date
Nicolas Gramlich	29b22adccc	Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.	2012-06-13 14:19:13 -07:00
James Chen	33ea7905a5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/platform/ios/CCFileUtils.mm	2012-06-11 11:01:36 +08:00
James Chen	c95cbb1774	issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. ... Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries. Fixed a bug in CCDirector, made retina mode work correctly.	2012-06-11 10:59:57 +08:00
minggo	94235d3602	issue #1310: make tests and HelloWorld work ok	2012-06-11 10:41:52 +08:00
James Chen	99dcb4de86	issue #1263: Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.	2012-05-28 14:14:19 +08:00
Walzer	2addd06f21	fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.	2012-05-02 10:39:17 +08:00
James Chen	8e5668472f	issue #1188: Updated project configuration for ios platform.	2012-04-25 17:33:28 +08:00