axmol/cocos/2d
minggo a1ef303f47 Merge pull request #18294 from minggo/sync-v316
Sync v316
2017-09-21 11:07:20 +08:00
..
libcocos2d_win10 revert updating flatbuffers (#17930) 2017-06-15 13:42:50 +08:00
win10_props V3 win10 websockets (#17310) 2017-02-08 09:44:06 +08:00
CCAction.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAction.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionCamera.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionCamera.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionCatmullRom.cpp Remove unnecessary dynamic allocation (#18014) 2017-07-04 14:31:29 +08:00
CCActionCatmullRom.h Remove unnecessary dynamic allocation (#18014) 2017-07-04 14:31:29 +08:00
CCActionEase.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionEase.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionGrid.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionGrid.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionGrid3D.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionGrid3D.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionInstant.cpp fix the issue the sequence action will not be invoked (#17906) 2017-06-08 14:52:36 +08:00
CCActionInstant.h Flag the end of ActionInstant and ActionInterval. (#17557) 2017-03-22 14:17:49 +08:00
CCActionInterval.cpp Sequence issue (#18009) 2017-07-03 09:15:53 +08:00
CCActionInterval.h Sequence issue (#18009) 2017-07-03 09:15:53 +08:00
CCActionManager.cpp Merge v3.15.1 (#17897) 2017-06-05 13:37:50 +08:00
CCActionManager.h Merge v3.15.1 (#17897) 2017-06-05 13:37:50 +08:00
CCActionPageTurn3D.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionPageTurn3D.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionProgressTimer.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionProgressTimer.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionTiledGrid.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionTiledGrid.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionTween.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCActionTween.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAnimation.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAnimation.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAnimationCache.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAnimationCache.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAtlasNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAtlasNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAutoPolygon.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCAutoPolygon.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCCamera.cpp Set camera type accordingly in Camera's init methods (#17809) 2017-05-16 09:17:15 +08:00
CCCamera.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCCameraBackgroundBrush.cpp update vertex buffer to update color (#18283) 2017-09-19 09:41:10 +08:00
CCCameraBackgroundBrush.h use VAO/VBO to improve performance (#18066) 2017-07-17 15:16:42 +08:00
CCClippingNode.cpp VS and XCode project files have non-existent file references (#17512) 2017-03-16 13:54:50 +08:00
CCClippingNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCClippingRectangleNode.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCClippingRectangleNode.h Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCComponent.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCComponent.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCComponentContainer.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCComponentContainer.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCDrawNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCDrawNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCDrawingPrimitives.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCDrawingPrimitives.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFastTMXLayer.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFastTMXLayer.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFastTMXTiledMap.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFastTMXTiledMap.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFont.cpp Improve coding style 2015-07-30 11:33:18 +08:00
CCFont.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontAtlas.cpp fix FontAtlas crash on some Android devices (#18145) 2017-08-17 00:06:01 +08:00
CCFontAtlas.h fix FontAtlas crash on some Android devices (#18145) 2017-08-17 00:06:01 +08:00
CCFontAtlasCache.cpp correct usage of reference count of LabelAtlas (#18117) 2017-07-31 09:05:55 +08:00
CCFontAtlasCache.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontCharMap.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontCharMap.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontFNT.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontFNT.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCFontFreeType.cpp correct usage of reference count of LabelAtlas (#18117) 2017-07-31 09:05:55 +08:00
CCFontFreeType.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCGLBufferedNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCGLBufferedNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCGrabber.cpp Updates license year. (#17363) 2017-02-14 14:59:12 +08:00
CCGrabber.h Updates license year. (#17363) 2017-02-14 14:59:12 +08:00
CCGrid.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCGrid.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabel.cpp correct usage of reference count of LabelAtlas (#18117) 2017-07-31 09:05:55 +08:00
CCLabel.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelAtlas.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelAtlas.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelBMFont.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelBMFont.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelTTF.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelTTF.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCLabelTextFormatter.cpp Fix issue #15926 2017-05-05 16:52:15 +02: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 LayerMultiplex::switch(int ,bool) (#18224) 2017-09-08 09:28:57 +08:00
CCLayer.h add LayerMultiplex::switch(int ,bool) (#18224) 2017-09-08 09:28:57 +08:00
CCLight.cpp
CCLight.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCMenu.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCMenu.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCMenuItem.cpp Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +08:00
CCMenuItem.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCMotionStreak.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCMotionStreak.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCNode.cpp initialize callback functions (#17918) 2017-06-12 10:43:45 +08:00
CCNode.h Merge v3.15.1 (#17897) 2017-06-05 13:37:50 +08:00
CCNodeGrid.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCNodeGrid.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParallaxNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParallaxNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleBatchNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleBatchNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleExamples.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleExamples.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleSystem.cpp Add sourcePosition compatible support. (#18230) 2017-09-07 17:16:46 +08:00
CCParticleSystem.h Add sourcePosition compatible support. (#18230) 2017-09-07 17:16:46 +08:00
CCParticleSystemQuad.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCParticleSystemQuad.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCProgressTimer.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCProgressTimer.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCProtectedNode.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCProtectedNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCRenderTexture.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCRenderTexture.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCScene.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCScene.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCSprite.cpp Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. (#18085) 2017-07-19 11:08:12 +08:00
CCSprite.h Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. (#18085) 2017-07-19 11:08:12 +08:00
CCSpriteBatchNode.cpp Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +08:00
CCSpriteBatchNode.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCSpriteFrame.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCSpriteFrame.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCSpriteFrameCache.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCSpriteFrameCache.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXLayer.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXLayer.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXObjectGroup.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXObjectGroup.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXTiledMap.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXTiledMap.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTMXXMLParser.cpp TMX: Added support for reading the object.rotation attribute (#11540) 2017-09-20 14:31:15 +08:00
CCTMXXMLParser.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTextFieldTTF.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTextFieldTTF.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTileMapAtlas.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTileMapAtlas.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTransition.cpp Fix minor typos (#18289) 2017-09-20 09:05:00 +08:00
CCTransition.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTransitionPageTurn.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTransitionPageTurn.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTransitionProgress.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTransitionProgress.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTweenFunction.cpp Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CCTweenFunction.h Update license to 2017 (#17362) 2017-02-14 14:36:57 +08:00
CMakeLists.txt Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
cocos2d.def
cocos2d_headers.props Refactor WebSocket to support SSL (wss) (#17172) 2017-01-19 13:55:14 +08:00
cocos2dx.props updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
libcocos2d.vcxproj Add controller support for Linux and Win32 (#17990) 2017-07-10 10:30:04 +08:00
libcocos2d.vcxproj.filters revert updating flatbuffers (#17930) 2017-06-15 13:42:50 +08:00