axmol/cocos/2d
minggo eb6ddea26e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 10:01:24 +08: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 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09: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 coding style fix 2014-05-28 17:41:34 +08:00
CCActionGrid.h coding style fix 2014-05-28 17:41:34 +08: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 fix transform for physics. 2014-06-27 17:30:21 +08:00
CCActionInterval.h closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
CCActionManager.cpp coding style fix 2014-05-28 17:41:34 +08: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 coding style fix 2014-05-28 17:41:34 +08:00
CCActionProgressTimer.h coding style fix 2014-05-28 17:41:34 +08:00
CCActionTiledGrid.cpp coding style fix 2014-05-28 17:41:34 +08:00
CCActionTiledGrid.h coding style fix 2014-05-28 17:41:34 +08:00
CCActionTween.cpp coding style fix 2014-05-28 17:41:34 +08:00
CCActionTween.h coding style fix 2014-05-28 17:41:34 +08:00
CCAnimation.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCAnimation.h issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
CCAnimationCache.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCAnimationCache.h yeah... love in includes 2014-04-26 10:35:57 -07:00
CCAtlasNode.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCAtlasNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCClippingNode.cpp Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
CCClippingNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -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 Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCDrawNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCDrawingPrimitives.cpp coding style fix 2014-05-28 17:41:34 +08:00
CCDrawingPrimitives.h coding style fix 2014-05-28 17:41:34 +08:00
CCFastTMXLayer.cpp unbind the VAO anyway to for safety. 2014-06-30 21:08:43 +08:00
CCFastTMXLayer.h remove deprecated function 2014-06-27 18:00:06 +08:00
CCFastTMXTiledMap.cpp fix bug for tileset searching 2014-06-30 11:08:57 +08:00
CCFastTMXTiledMap.h remove deprecated function 2014-06-27 18:00:06 +08: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 close issue#5158:Label's display may go bonkers if using outline feature. 2014-06-09 10:12:22 +08:00
CCFontAtlas.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCFontAtlasCache.cpp close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 11:38:45 +08:00
CCFontAtlasCache.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFontCharMap.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCFontCharMap.h issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
CCFontFNT.cpp bug fix FontFNT.cpp 2014-05-19 18:42:11 +09:00
CCFontFNT.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCFontFreeType.cpp Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
CCFontFreeType.h issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 14:08:30 +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 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
CCLabel.h add test case for new API of Label. 2014-06-18 18:01:55 +08:00
CCLabelAtlas.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelAtlas.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelBMFont.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelBMFont.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTTF.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTTF.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTextFormatter.cpp 1.Support setting up the line height and additional kerning of label. 2014-06-12 12:01:15 +08:00
CCLabelTextFormatter.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLayer.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLayer.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCMenu.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCMenu.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08: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 Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCMotionStreak.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCNode.cpp fix crash cause by std::regex 2014-06-30 20:45:01 +08:00
CCNode.h Merge pull request #7234 from boyu0/iss5614_physics_transform 2014-06-29 17:23:20 +08:00
CCNodeGrid.cpp Little fixes for setNormalized 2014-05-30 21:50:39 -07:00
CCNodeGrid.h Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
CCParallaxNode.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParallaxNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParticleBatchNode.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParticleBatchNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08: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 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
CCParticleSystem.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleSystemQuad.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCParticleSystemQuad.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCProgressTimer.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCProgressTimer.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCRenderTexture.cpp Make the API more extendable 2014-06-13 15:27:59 +08:00
CCRenderTexture.h Make the API more extendable 2014-06-13 15:27:59 +08:00
CCScene.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCScene.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCSprite.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCSprite.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCSpriteBatchNode.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCSpriteBatchNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCSpriteFrame.cpp Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected 2014-06-10 11:28:34 +08:00
CCSpriteFrame.h Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
CCSpriteFrameCache.cpp Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
CCSpriteFrameCache.h fix coding style 2014-05-30 15:13:59 +08: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 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09: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 Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTextFieldTTF.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -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 Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTransition.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTransitionPageTurn.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTransitionPageTurn.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -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 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00
cocos2d.vcxproj Merge branch 'v3' into fast_tmx 2014-06-29 20:23:43 +08:00
cocos2d.vcxproj.filters fix merge conflitcts on windows 2014-06-29 20:30:26 +08: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 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
cocos2d_winrt.vcxproj.filters added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
cocos2d_winrt_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_wp8.vcxproj add missing files for the projects 2014-06-30 17:07:55 +08:00
cocos2d_wp8.vcxproj.filters add missing files for the projects 2014-06-30 17:07:55 +08: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