axmol/cocos/2d
xiaofeng11 434c79ae90 Merge pull request #14793 from super626/fixsprite2
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697.
We need merge it to V3.10 to file TMX render bug.
2015-12-24 09:40:36 +08:00
..
libcocos2d_8_1 updated dll name to v3.10 2015-12-09 17:33:14 -08:00
libcocos2d_win10 updated dll name to v3.10 2015-12-09 17:33:14 -08:00
win10_props added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
winrt_8.1_props Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07:00
wp_8.1_props
CCAction.cpp support custom action, and rewrite update function 2015-09-09 10:08:07 +08:00
CCAction.h support custom action, and rewrite update function 2015-09-09 10:08:07 +08:00
CCActionCamera.cpp fix typos 2015-09-09 11:37:41 +08:00
CCActionCamera.h Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
CCActionCatmullRom.cpp
CCActionCatmullRom.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCActionEase.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCActionEase.h
CCActionGrid.cpp Merge pull request #12744 from fusijie/fix_pageturndown 2015-07-28 11:35:15 +08:00
CCActionGrid.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionGrid3D.cpp
CCActionGrid3D.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionInstant.cpp support custom action, and rewrite update function 2015-09-09 10:08:07 +08:00
CCActionInstant.h Fix typos 2015-10-09 17:59:11 +09:00
CCActionInterval.cpp Adds init(array) for Sequence and Spawn 2015-12-03 12:16:21 -08:00
CCActionInterval.h Merge pull request #14569 from mogemimi/fix-docs-typo 2015-12-04 09:55:30 +08:00
CCActionManager.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionManager.h added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02:00
CCActionPageTurn3D.cpp Completed test case and comment. 2015-07-08 22:34:33 +08:00
CCActionPageTurn3D.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionProgressTimer.cpp
CCActionProgressTimer.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionTiledGrid.cpp Remove comment out codes 2015-10-27 18:43:51 +08:00
CCActionTiledGrid.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionTween.cpp
CCActionTween.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCAnimation.cpp Animation ported to JS 2015-12-03 15:02:39 -08:00
CCAnimation.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
CCAnimationCache.cpp
CCAnimationCache.h
CCAtlasNode.cpp
CCAtlasNode.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCAutoPolygon.cpp improve scale9sprite 2015-10-29 10:41:58 +08:00
CCAutoPolygon.h improve scale9sprite 2015-10-29 10:41:58 +08:00
CCCamera.cpp Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCCamera.h Remove condition MACRO and remove ASSERT in Sprite::initWithFile function 2015-11-26 14:47:37 +08:00
CCCameraBackgroundBrush.cpp Bug fix & make test case more clear. 2015-12-07 18:36:28 +08:00
CCCameraBackgroundBrush.h Merge pull request #14502 from xiaofeng11/v3_combine_2d 2015-12-04 16:05:24 +08:00
CCClippingNode.cpp fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
CCClippingNode.h refactor stencil state management code 2015-11-25 14:14:17 +08:00
CCClippingRectangleNode.cpp Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCClippingRectangleNode.h fixed region x,y scale bug. 2015-09-18 13:39:22 +08:00
CCComponent.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComponent.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComponentContainer.cpp no message 2015-11-27 23:33:20 +10:00
CCComponentContainer.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCDrawNode.cpp Remove desktop only function, set ondraw serial function in DrawNode override able. 2015-12-04 14:55:54 +08:00
CCDrawNode.h Fix indent 2015-12-04 15:14:47 +08:00
CCDrawingPrimitives.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCDrawingPrimitives.h Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
CCFastTMXLayer.cpp Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00
CCFastTMXLayer.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCFastTMXTiledMap.cpp experimental::TileMap:Fixed crash if referring a non-existent layer in TMX. 2015-05-22 11:14:34 +08:00
CCFastTMXTiledMap.h
CCFont.cpp Improve coding style 2015-07-30 11:33:18 +08:00
CCFont.h Improve coding style 2015-07-30 11:33:18 +08:00
CCFontAtlas.cpp improve the code by code review suggestions. 2015-11-26 12:03:18 +08:00
CCFontAtlas.h Add Label Overflow and wrap option. 2015-11-19 16:06:13 +08:00
CCFontAtlasCache.cpp Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCFontAtlasCache.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCFontCharMap.cpp Improve coding style 2015-07-30 11:33:18 +08:00
CCFontCharMap.h Improve coding style 2015-07-30 11:33:18 +08:00
CCFontFNT.cpp Fix deprecation warning in FontFNT 2015-12-15 02:25:32 +09:00
CCFontFNT.h Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 2015-11-28 12:48:55 +08:00
CCFontFreeType.cpp Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCFontFreeType.h Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCGLBufferedNode.cpp
CCGLBufferedNode.h
CCGrabber.cpp
CCGrabber.h
CCGrid.cpp Merge pull request #12744 from fusijie/fix_pageturndown 2015-07-28 11:35:15 +08:00
CCGrid.h fix typos 2015-09-09 11:37:41 +08:00
CCLabel.cpp fix bmfont size error 2015-12-13 13:59:42 +08:00
CCLabel.h update for code format 2015-12-11 12:04:54 +08:00
CCLabelAtlas.cpp
CCLabelAtlas.h
CCLabelBMFont.cpp
CCLabelBMFont.h
CCLabelTTF.cpp Label:improving the code readability. 2015-07-14 11:30:56 +08:00
CCLabelTTF.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCLabelTextFormatter.cpp fix horizontal clamp and shrink issue 2015-12-07 18:13:03 +08:00
CCLabelTextFormatter.h Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
CCLayer.cpp add physics component 2015-09-08 09:54:01 +08:00
CCLayer.h fix typos 2015-09-09 11:37:41 +08:00
CCLight.cpp
CCLight.h
CCMenu.cpp Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable. 2015-08-07 16:30:22 +08:00
CCMenu.h Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable. 2015-08-07 16:30:22 +08:00
CCMenuItem.cpp Limit force GC in menu item only work in lua-binding 2015-12-23 12:30:59 +08:00
CCMenuItem.h Uncoupling the implementation of MenuItemToggle dependence on tag. 2015-09-09 15:32:44 +08:00
CCMotionStreak.cpp remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
CCMotionStreak.h
CCNode.cpp Node::getName() returns string by reference 2015-10-05 21:42:07 +02:00
CCNode.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCNodeGrid.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCNodeGrid.h Completed test case and comment. 2015-07-08 22:34:33 +08:00
CCParallaxNode.cpp
CCParallaxNode.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
CCParticleBatchNode.cpp Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
CCParticleBatchNode.h
CCParticleExamples.cpp
CCParticleExamples.h
CCParticleSystem.cpp Remove cocostudio header file from sprite and particle, and adjust tests 2015-12-04 09:26:14 +08:00
CCParticleSystem.h Remove cocostudio header file from sprite and particle, and adjust tests 2015-12-04 09:26:14 +08:00
CCParticleSystemQuad.cpp ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory" 2015-10-10 17:55:05 +08:00
CCParticleSystemQuad.h Refactory particle system. 2015-09-20 16:46:09 +08:00
CCProgressTimer.cpp Fixed SpriteProgressToRadialMidpointChanged bug. 2015-08-20 17:07:53 +08:00
CCProgressTimer.h
CCProtectedNode.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCProtectedNode.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCRenderTexture.cpp Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCRenderTexture.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCScene.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCScene.h Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCSprite.cpp Revert "fix setflip for batch sprite" 2015-12-23 09:54:04 -08:00
CCSprite.h Remove cocostudio header file from sprite and particle, and adjust tests 2015-12-04 09:26:14 +08:00
CCSpriteBatchNode.cpp add physics component 2015-09-08 09:54:01 +08:00
CCSpriteBatchNode.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCSpriteFrame.cpp extend SpriteFrameCache to load PolygonInfo from plist file 2015-09-29 15:42:04 +02:00
CCSpriteFrame.h fixed typo, indentation 2015-09-29 16:50:14 +02:00
CCSpriteFrameCache.cpp Editing code as comment. 2015-12-04 10:43:39 +08:00
CCSpriteFrameCache.h Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCTMXLayer.cpp Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00
CCTMXLayer.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCTMXObjectGroup.cpp
CCTMXObjectGroup.h
CCTMXTiledMap.cpp Fix #24345 2015-12-09 15:07:58 +08:00
CCTMXTiledMap.h Editing code as comment. 2015-12-04 10:43:39 +08:00
CCTMXXMLParser.cpp Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCTMXXMLParser.h Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
CCTextFieldTTF.cpp Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
CCTextFieldTTF.h Fix typos in documentation 2015-10-23 16:59:51 +09:00
CCTileMapAtlas.cpp
CCTileMapAtlas.h
CCTransition.cpp Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
CCTransition.h
CCTransitionPageTurn.cpp
CCTransitionPageTurn.h
CCTransitionProgress.cpp
CCTransitionProgress.h
CCTweenFunction.cpp
CCTweenFunction.h
CMakeLists.txt Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
cocos2d.def
cocos2d_headers.props Add $(EngineRoot)external for cocos2d_headers.props 2015-05-07 11:11:33 +08:00
cocos2dx.props updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
libcocos2d.vcxproj Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
libcocos2d.vcxproj.filters Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00