axmol/cocos/2d
andyque 657720e509 Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00
..
platform Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00
CCAction.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCAction.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionCamera.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCamera.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionCatmullRom.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionCatmullRom.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionEase.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionEase.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCActionGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionGrid3D.cpp Merge branch 'v3' into improved_directory_structure 2014-04-30 13:15:10 -07:00
CCActionGrid3D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInstant.cpp yeah... love in includes 2014-04-26 10:35:57 -07:00
CCActionInstant.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInterval.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionInterval.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCActionManager.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionManager.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCActionPageTurn3D.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionPageTurn3D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionProgressTimer.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionProgressTimer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTiledGrid.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCActionTiledGrid.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTween.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionTween.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCAnimation.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCAnimation.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCAnimationCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCAnimationCache.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCAtlasNode.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCAtlasNode.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCClippingNode.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCClippingNode.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCComponent.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCComponent.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCComponentContainer.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCComponentContainer.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCDrawNode.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCDrawNode.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCDrawingPrimitives.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCDrawingPrimitives.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCFont.cpp
CCFont.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlas.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontAtlas.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCFontAtlasCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontAtlasCache.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontCharMap.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontCharMap.h
CCFontFNT.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontFNT.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCFontFreeType.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCFontFreeType.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCGLBufferedNode.cpp
CCGLBufferedNode.h
CCGLProgram.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCGLProgram.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCGrabber.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCGrabber.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCGrid.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCGrid.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCIMEDelegate.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCIMEDispatcher.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCIMEDispatcher.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabel.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCLabel.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCLabelAtlas.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCLabelAtlas.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCLabelBMFont.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCLabelBMFont.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCLabelTTF.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTTF.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCLabelTextFormatter.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCLabelTextFormatter.h
CCLayer.cpp rolling back tests 2014-05-01 16:55:28 -07:00
CCLayer.h rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCMenu.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCMenu.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCMenuItem.cpp yeah... love in includes 2014-04-26 10:35:57 -07:00
CCMenuItem.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCMotionStreak.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCMotionStreak.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCNode.cpp rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCNode.h rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCNodeGrid.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCNodeGrid.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCParallaxNode.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParallaxNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleBatchNode.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCParticleBatchNode.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCParticleExamples.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCParticleExamples.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystem.cpp Particles can be created without texture 2014-05-05 15:50:08 -07:00
CCParticleSystem.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCParticleSystemQuad.cpp Particles can be created without texture 2014-05-05 15:50:08 -07:00
CCParticleSystemQuad.h Particles can be created without texture 2014-05-05 15:50:08 -07:00
CCProgressTimer.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCProgressTimer.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCProtocols.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCRenderTexture.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCRenderTexture.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCScene.cpp rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCScene.h rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCScriptSupport.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCScriptSupport.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCShaderCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCShaderCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSprite.cpp Revert `new Sprite` change done a few days ago 2014-05-05 16:53:37 -07:00
CCSprite.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCSpriteBatchNode.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCSpriteBatchNode.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCSpriteFrame.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCSpriteFrame.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCSpriteFrameCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCSpriteFrameCache.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCTMXLayer.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTMXLayer.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXObjectGroup.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCTMXObjectGroup.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCTMXTiledMap.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTMXTiledMap.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCTMXXMLParser.cpp fixes tmx maps 2014-05-01 11:51:11 -07:00
CCTMXXMLParser.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCTextFieldTTF.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCTextFieldTTF.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTexture2D.cpp [hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-06 10:36:55 +08:00
CCTexture2D.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCTextureAtlas.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTextureAtlas.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCTextureCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTextureCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTileMapAtlas.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCTileMapAtlas.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCTransition.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTransition.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTransitionPageTurn.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTransitionPageTurn.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTransitionProgress.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTransitionProgress.h Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCTweenFunction.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTweenFunction.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCUserDefault.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCUserDefault.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCUserDefault.mm
CCUserDefaultAndroid.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCVertex.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCVertex.h Improved directory structure 2014-04-29 17:37:36 -07:00
CMakeLists.txt linux cmake improvements 2014-05-01 13:01:51 -07:00
TGAlib.cpp yeah... love in includes 2014-04-26 10:35:57 -07:00
TGAlib.h
ccCArray.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
ccCArray.h Improved directory structure 2014-04-29 17:37:36 -07:00
ccFPSImages.c issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
ccFPSImages.h Improved directory structure 2014-04-29 17:37:36 -07:00
ccGLStateCache.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
ccGLStateCache.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccShader_Label_frag_df.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_df_glow.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_normal.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_outline.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_vert.h
ccShader_PositionColorLengthTexture_frag.h
ccShader_PositionColorLengthTexture_vert.h
ccShader_PositionColor_frag.h
ccShader_PositionColor_vert.h
ccShader_PositionTextureA8Color_frag.h
ccShader_PositionTextureA8Color_vert.h
ccShader_PositionTextureColorAlphaTest_frag.h
ccShader_PositionTextureColor_frag.h
ccShader_PositionTextureColor_noMVP_frag.h
ccShader_PositionTextureColor_noMVP_vert.h
ccShader_PositionTextureColor_vert.h
ccShader_PositionTexture_frag.h
ccShader_PositionTexture_uColor_frag.h
ccShader_PositionTexture_uColor_vert.h
ccShader_PositionTexture_vert.h
ccShader_Position_uColor_frag.h
ccShader_Position_uColor_vert.h
ccShaders.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
ccShaders.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccUTF8.cpp yeah... love in includes 2014-04-26 10:35:57 -07:00
ccUTF8.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
ccUtils.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
ccUtils.h
cocos2d.vcxproj issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
cocos2d.vcxproj.filters issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
cocos2d_headers.props [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
cocos2d_winrt.props added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt.vcxproj added missing files 2014-04-19 10:11:44 -07:00
cocos2d_winrt.vcxproj.filters added missing files 2014-04-19 10:11:44 -07:00
cocos2d_winrt_headers.props added missing include paths 2014-04-19 10:12:06 -07:00
cocos2d_wp8.vcxproj updated missing files 2014-05-05 13:26:28 -07:00
cocos2d_wp8.vcxproj.filters updated missing files 2014-05-05 13:26:28 -07:00
cocos2d_wp8_headers.props updated property sheet include paths and warnings 2014-04-19 10:09:10 -07:00
cocos2dx-Prefix.pch
cocos2dx.props
firePngData.h
uthash.h
utlist.h