axmol/cocos/2d
zifter d875f27c67 Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
2014-05-17 10:40:36 +03:00
..
CCAction.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCAction.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionCamera.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionCamera.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionCatmullRom.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionCatmullRom.h Squashed commit of the following: 2014-05-14 10:07:09 -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-05-16 14:36:00 -07:00
CCActionGrid.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionGrid3D.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionGrid3D.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionInstant.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCActionInstant.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionInterval.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionInterval.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCActionManager.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCActionManager.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCActionPageTurn3D.cpp Squashed commit of the following: 2014-05-14 10:07:09 -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-05-14 10:07:09 -07:00
CCActionTiledGrid.h Squashed commit of the following: 2014-05-14 10:07:09 -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-05-16 14:36:00 -07:00
CCAnimation.h issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
CCAnimationCache.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCAnimationCache.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCAtlasNode.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCAtlasNode.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCClippingNode.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCClippingNode.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCComponent.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCComponent.h Squashed commit of the following: 2014-05-16 14:36:00 -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-05-14 10:07:09 -07:00
CCDrawNode.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDrawingPrimitives.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDrawingPrimitives.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFont.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFont.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCFontAtlas.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFontAtlas.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCFontAtlasCache.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFontAtlasCache.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFontCharMap.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFontCharMap.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCFontFNT.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFontFNT.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFontFreeType.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFontFreeType.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCGLBufferedNode.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGLBufferedNode.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGrabber.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGrabber.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCGrid.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGrid.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLabel.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLabel.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCLabelAtlas.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLabelAtlas.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCLabelBMFont.cpp Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
CCLabelBMFont.h Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
CCLabelTTF.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCLabelTTF.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCLabelTextFormatter.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLabelTextFormatter.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLayer.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLayer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMenu.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCMenu.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCMenuItem.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMenuItem.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMotionStreak.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMotionStreak.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCNode.cpp Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
CCNode.h Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 2014-05-17 10:40:36 +03:00
CCNodeGrid.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCNodeGrid.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCParallaxNode.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParallaxNode.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCParticleBatchNode.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleBatchNode.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleExamples.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleExamples.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystem.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleSystem.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleSystemQuad.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleSystemQuad.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCProgressTimer.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCProgressTimer.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCRenderTexture.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRenderTexture.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCScene.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCScene.h rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCSprite.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSprite.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteBatchNode.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteBatchNode.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteFrame.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteFrame.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteFrameCache.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSpriteFrameCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTMXLayer.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTMXLayer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTMXObjectGroup.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTMXObjectGroup.h Squashed commit of the following: 2014-05-14 10:07:09 -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 Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTMXXMLParser.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTextFieldTTF.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTextFieldTTF.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTileMapAtlas.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTileMapAtlas.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransition.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransition.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransitionPageTurn.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransitionPageTurn.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransitionProgress.cpp Squashed commit of the following: 2014-05-14 10:07:09 -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
CMakeLists.txt Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.vcxproj Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.vcxproj.filters Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_winrt.props added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt.vcxproj updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
cocos2d_winrt.vcxproj.filters updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
cocos2d_winrt_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_wp8.vcxproj Squashed commit of the following: 2014-05-16 17:38:52 -07:00
cocos2d_wp8.vcxproj.filters Squashed commit of the following: 2014-05-16 17:38:52 -07:00
cocos2d_wp8_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2dx.props Fixing compilation errors on windows. 2013-12-05 16:09:38 +08:00