James Chen a71e5be0d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data ... Conflicts: cocos2dx/shaders/CCGLProgram.cpp		2012-04-16 12:45:47 +08:00
..
CCAnimation.cpp	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00
CCAnimationCache.cpp	optimize data struct.	2012-04-14 19:11:57 +08:00
CCSprite.cpp	fixed #1165: Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.	2012-04-16 12:00:35 +08:00
CCSpriteBatchNode.cpp	issue #1056: Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.	2012-03-29 14:30:13 +08:00
CCSpriteFrame.cpp	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
CCSpriteFrameCache.cpp	optimize data struct.	2012-04-14 19:11:57 +08:00