axmol/cocos/2d
Ricardo Quesada 0f67247325 Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
2014-05-16 14:36:00 -07: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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCLabelBMFont.h Squashed commit of the following: 2014-05-14 10:07:09 -07: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 Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCNode.h Squashed commit of the following: 2014-05-16 14:36:00 -07: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 14:36:00 -07:00
cocos2d_wp8.vcxproj.filters Squashed commit of the following: 2014-05-16 14:36:00 -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