axmol/cocos/2d
HALX99 c08e2cda4d
Merge branch 'v4' into v4
2019-11-22 10:29:11 +08:00
..
CCAction.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAction.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCActionCamera.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCamera.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCatmullRom.cpp fix C4244 warning (#20162) 2019-09-25 14:32:26 +08:00
CCActionCatmullRom.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionEase.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCActionEase.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionGrid.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCActionGrid.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCActionGrid3D.cpp fix C4244 warning (#20162) 2019-09-25 14:32:26 +08:00
CCActionGrid3D.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionInstant.cpp metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCActionInstant.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCActionInterval.cpp Revert "fix RotateTo animation when angle is bigger than 360 (#20009) (#20211)" (#20257) 2019-10-28 09:53:07 +08:00
CCActionInterval.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCActionManager.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionManager.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCActionPageTurn3D.cpp fix C4244 warning (#20162) 2019-09-25 14:32:26 +08:00
CCActionPageTurn3D.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionProgressTimer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionProgressTimer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTiledGrid.cpp fix effect test (#20286) 2019-11-06 16:25:30 +08:00
CCActionTiledGrid.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTween.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTween.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAnimation.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCAnimation.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCAnimationCache.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCAnimationCache.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCAtlasNode.cpp Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCAtlasNode.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCAutoPolygon.cpp fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
CCAutoPolygon.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCCamera.cpp fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
CCCamera.h [3d] terrain impl & test case (#19442) 2019-02-27 17:16:25 +08:00
CCCameraBackgroundBrush.cpp delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
CCCameraBackgroundBrush.h remove opengl codes (#19797) 2019-06-05 02:58:33 -07:00
CCClippingNode.cpp fix ProgramState and Program performance (#20189) 2019-10-15 09:40:59 +08:00
CCClippingNode.h fix clipping node issue (#20100) 2019-09-05 09:17:43 +08:00
CCClippingRectangleNode.cpp fix scissor rectangle setting 2019-05-16 13:48:44 +08:00
CCClippingRectangleNode.h ClippingRectangleNode works 2019-03-13 14:27:47 +08:00
CCComponent.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponent.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponentContainer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponentContainer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCDrawNode.cpp delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
CCDrawNode.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCFastTMXLayer.cpp delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
CCFastTMXLayer.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCFastTMXTiledMap.cpp Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
CCFastTMXTiledMap.h Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
CCFont.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFont.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCFontAtlas.cpp v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCFontAtlas.h fix compile warnings (#20028) 2019-08-13 18:19:32 +08:00
CCFontAtlasCache.cpp fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
CCFontAtlasCache.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontCharMap.cpp fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
CCFontCharMap.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontFNT.cpp fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
CCFontFNT.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontFreeType.cpp fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
CCFontFreeType.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCGrid.cpp fix effect test (#20286) 2019-11-06 16:25:30 +08:00
CCGrid.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCLabel.cpp Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCLabel.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCLabelAtlas.cpp fix warning (#20146) 2019-09-24 11:31:35 +08:00
CCLabelAtlas.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCLabelTextFormatter.cpp Fix for Label and UIRichEdit text trailing space trimming (#18876) 2018-06-08 17:06:29 +08:00
CCLabelTextFormatter.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLayer.cpp remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
CCLayer.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCLight.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLight.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMenu.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCMenu.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCMenuItem.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCMenuItem.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCMotionStreak.cpp Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCMotionStreak.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCNode.cpp TextureFormatEXT 2019-11-22 03:36:01 +08:00
CCNode.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCNodeGrid.cpp metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCNodeGrid.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCParallaxNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParallaxNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleBatchNode.cpp Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCParticleBatchNode.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCParticleExamples.cpp fix warning (#20146) 2019-09-24 11:31:35 +08:00
CCParticleExamples.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleSystem.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCParticleSystem.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCParticleSystemQuad.cpp Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCParticleSystemQuad.h Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
CCProgressTimer.cpp delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
CCProgressTimer.h v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCProtectedNode.cpp remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCProtectedNode.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCRenderTexture.cpp V4 RenderTexture PMA flag fix (#20153) 2019-09-26 16:11:23 +08:00
CCRenderTexture.h Added support for saving non-premultiplied alpha images from RenderTexture. (#19990) 2019-07-26 17:09:00 +08:00
CCScene.cpp refactor CCScene (#19767) (#19944) 2019-07-22 09:36:38 +08:00
CCScene.h refactor CCScene (#19767) (#19944) 2019-07-22 09:36:38 +08:00
CCSprite.cpp v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCSprite.h Merge from official-v4. 2019-11-20 18:27:56 +08:00
CCSpriteBatchNode.cpp Remove comment. 2019-11-20 18:44:45 +08:00
CCSpriteBatchNode.h Fix merge error. 2019-11-20 18:35:48 +08:00
CCSpriteFrame.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteFrame.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteFrameCache.cpp fix crash when plist filename hasn't suffix (#19999) (#20212) 2019-10-17 11:12:37 +08:00
CCSpriteFrameCache.h sync 19634 and fix conflict (#19930) 2019-07-19 11:57:11 +08:00
CCTMXLayer.cpp v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
CCTMXLayer.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCTMXObjectGroup.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXObjectGroup.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCTMXTiledMap.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXTiledMap.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCTMXXMLParser.cpp fix warning (#20146) 2019-09-24 11:31:35 +08:00
CCTMXXMLParser.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCTextFieldTTF.cpp Checking, does the touch is within the height of the line, not the height of the sprite? (#19394) (#19594) 2019-04-10 18:32:09 -07:00
CCTextFieldTTF.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTileMapAtlas.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTileMapAtlas.h metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00
CCTransition.cpp fix warning (#20146) 2019-09-24 11:31:35 +08:00
CCTransition.h remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
CCTransitionPageTurn.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionPageTurn.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionProgress.cpp Feature/fix mipmap issues (#19753) 2019-06-02 18:39:51 -07:00
CCTransitionProgress.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTweenFunction.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTweenFunction.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CMakeLists.txt metal support for cocos2d-x (#19305) 2019-01-18 15:08:25 +08:00