axmol/cocos2dx/include
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
..
CCAccelerometer.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCAccelerometerDelegate.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCAction.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCActionCamera.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionEase.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionGrid.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionGrid3D.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionInstant.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCActionInterval.h 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
CCActionManager.h 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
CCActionPageTurn3D.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionProgressTimer.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCActionTiledGrid.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCAffineTransform.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCAnimation.h 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.h 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
CCApplication.h modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 2011-08-25 19:04:29 +08:00
CCArray.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCAtlasNode.h issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
CCAutoreleasePool.h issue #1094: renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton. 2012-04-08 12:50:15 +08:00
CCCamera.h issue #1094: Make ParticleBatchNode works on win32. 2012-04-07 12:02:40 +08:00
CCData.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCDictionary.h issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
CCDirector.h issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
CCDrawingPrimitives.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCEGLView.h modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 2011-08-25 19:04:29 +08:00
CCGL.h modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 2011-08-25 19:04:29 +08:00
CCGLProgram.h issue #1506: implement ShaderTest 2012-03-21 17:02:52 +08:00
CCGeometry.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCIMEDelegate.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCIMEDispatcher.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCInteger.h add CCDictionary based on UTHASH, improve the performance. 2012-03-19 14:53:44 +08:00
CCKeypadDelegate.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCKeypadDispatcher.h issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
CCLabelAtlas.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCLabelBMFont.h issue #1056: Update CCLabelBMFont. 2012-03-22 09:46:07 +08:00
CCLabelTTF.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCLayer.h 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
CCMenu.h issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function. 2012-03-22 14:22:06 +08:00
CCMenuItem.h 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
CCMotionStreak.h issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak. 2012-03-14 16:10:01 +08:00
CCNode.h 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
CCObject.h issue #1094: Make ParticleBatchNode works on win32. 2012-04-07 12:02:40 +08:00
CCParallaxNode.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCParticleBatchNode.h issue #1056: Updated ParticleTest. 2012-03-22 18:29:07 +08:00
CCParticleExamples.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCParticleSystem.h issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad. 2012-03-28 21:44:28 +08:00
CCParticleSystemQuad.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCPointExtension.h issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak. 2012-03-14 16:10:01 +08:00
CCProgressTimer.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCProtocols.h issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCRenderTexture.h issue #1506: RenderTextureTest 2012-03-22 16:36:03 +08:00
CCScene.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCScheduler.h issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
CCScriptSupport.h Improve Lua engine 2012-03-07 20:27:26 +08:00
CCSet.h fixed #951: removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
CCShaderCache.h 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
CCSprite.h #issue #1056: Updated SpriteTest. 2012-03-23 17:31:28 +08:00
CCSpriteBatchNode.h 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
CCSpriteFrame.h issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCSpriteFrameCache.h 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
CCString.h issue #1094: Make ParticleBatchNode works on win32. 2012-04-07 12:02:40 +08:00
CCTMXLayer.h 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
CCTMXObjectGroup.h 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
CCTMXTiledMap.h 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
CCTMXXMLParser.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCTextFieldTTF.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCTexture2D.h return correct content size 2012-04-08 22:37:58 +08:00
CCTextureAtlas.h issue #1056: Check bugs of SpriteTest. 2012-03-26 18:44:28 +08:00
CCTextureCache.h 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
CCTexturePVR.h 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
CCTileMapAtlas.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCTouch.h fixed #737: remove view id 2012-03-08 12:40:27 +08:00
CCTouchDelegateProtocol.h merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
CCTouchDispatcher.h issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
CCTouchHandler.h fixed #951: removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
CCTransition.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCTransitionPageTurn.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCTransitionProgress.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCUserDefault.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
CCZone.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
ccConfig.h merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
ccGLStateCache.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
ccMacros.h issue #1056: Check bugs of SpriteTest. 2012-03-26 18:44:28 +08:00
ccShaders.h issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
ccTypes.h Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage. 2012-04-09 09:55:06 +08:00
cocos2d.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00