axmol/cocos2dx/include
natural-law 1bdce00740 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
..
CCAccelerometer.h issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
CCAccelerometerDelegate.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCAction.h fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
CCActionCamera.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCActionEase.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCActionGrid.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCActionGrid3D.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCActionInstant.h fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
CCActionInterval.h change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval* 2011-07-07 15:41:42 +08:00
CCActionManager.h fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
CCActionPageTurn3D.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCActionProgressTimer.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCActionTiledGrid.h fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
CCAffineTransform.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCAnimation.h fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCAnimationCache.h fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCApplication.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCArray.h fixed #587 2011-07-08 14:15:51 +08:00
CCAtlasNode.h fixed #554: upgrade base_nodes to 1.0.0-rc3 2011-07-01 15:48:05 +08:00
CCAutoreleasePool.h fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
CCCamera.h fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
CCData.h fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
CCDirector.h fixed #585 2011-07-08 14:48:25 +08:00
CCDrawingPrimitives.h fixed #568 2011-07-05 14:51:17 +08:00
CCEGLView.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCGL.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCGeometry.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCIMEDelegate.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCIMEDispatcher.h fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
CCKeypadDelegate.h [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
CCKeypadDispatcher.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCLabelAtlas.h fixed #590 2011-07-08 14:32:09 +08:00
CCLabelBMFont.h fixed #590 2011-07-08 14:32:09 +08:00
CCLabelTTF.h fixed #590 2011-07-08 14:32:09 +08:00
CCLayer.h issue #574 2011-07-06 14:56:05 +08:00
CCMenu.h issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
CCMenuItem.h fixed #iss559 2011-07-04 14:47:32 +08:00
CCMotionStreak.h fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
CCMutableArray.h Merge https://github.com/minggo/cocos2d-x into lua 2011-06-21 15:22:00 +08:00
CCMutableDictionary.h fixed #576, replace std::string to _KeyT in CCMutableDictionary class template 2011-07-07 08:19:29 +08:00
CCNode.h fixed #579: change zorder to int 2011-07-06 20:48:56 +08:00
CCObject.h fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
CCPVRTexture.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCParallaxNode.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCParticleExamples.h fixed #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
CCParticleSystem.h fix some compiling warnings 2011-07-07 11:27:45 +08:00
CCParticleSystemPoint.h fixed #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
CCParticleSystemQuad.h issue #574 2011-07-06 14:56:05 +08:00
CCPointExtension.h fixed #588. 2011-07-08 14:16:10 +08:00
CCProgressTimer.h fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
CCProtocols.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCRenderTexture.h fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
CCRibbon.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCScene.h fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3. 2011-07-01 11:26:26 +08:00
CCScheduler.h fixed #591 2011-07-08 15:02:46 +08:00
CCScriptSupport.h issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
CCSet.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCSprite.h fixed #591 2011-07-08 15:02:46 +08:00
CCSpriteBatchNode.h fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCSpriteFrame.h fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCSpriteFrameCache.h fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
CCString.h add std::string CCString::toStdString() method 2011-06-02 22:26:38 +08:00
CCTMXLayer.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCTMXObjectGroup.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCTMXTiledMap.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCTMXXMLParser.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCTextFieldTTF.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCTexture2D.h fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
CCTextureAtlas.h fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
CCTextureCache.h fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
CCTileMapAtlas.h fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
CCTouch.h fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCTouchDelegateProtocol.h fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx() 2011-06-21 16:59:17 +08:00
CCTouchDispatcher.h fixed #586 2011-07-08 15:01:51 +08:00
CCTransition.h fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3. 2011-07-01 11:26:26 +08:00
CCTransitionPageTurn.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCTransitionRadial.h issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
CCUserDefault.h fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +08:00
CCZone.h fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
ccConfig.h Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 17:08:57 +08:00
ccMacros.h upgrade to rc3 2011-07-07 16:03:03 +08:00
ccTypes.h fixed #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
cocos2d.h fixed #568 2011-07-05 14:51:17 +08:00
selector_protocol.h issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00