axmol/cocos/2d
songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
..
CCAction.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCAction.h convert indention to space 2014-07-18 14:53:00 +08: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 convert indention to space 2014-07-18 14:53:00 +08:00
CCActionGrid.cpp coding style fix 2014-05-28 17:41:34 +08:00
CCActionGrid.h convert indention to space 2014-07-18 14:53:00 +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 Merge pull request #7461 from joshuastray/fix_constructor_access 2014-08-06 10:15:02 +08:00
CCActionInterval.cpp RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
CCActionInterval.h RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02: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 change pure virtual function to virtual function in action series 2014-07-11 10:19:49 +08: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 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +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 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComponentContainer.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDrawNode.cpp Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 2014-07-09 23:03:04 +08:00
CCDrawNode.h Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions 2014-07-28 10:39:35 +08:00
CCDrawingPrimitives.cpp coding style fix 2014-05-28 17:41:34 +08:00
CCDrawingPrimitives.h add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
CCFastTMXLayer.cpp remove commented codes 2014-08-12 11:44:06 +08:00
CCFastTMXLayer.h fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
CCFastTMXTiledMap.cpp change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
CCFastTMXTiledMap.h change FastTileMap to TileMap 2014-07-17 14:09:53 +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 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 2014-07-09 23:03:04 +08:00
CCFontAtlas.h Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 2014-07-09 23:03:04 +08:00
CCFontAtlasCache.cpp Update CCFontAtlasCache.cpp 2014-07-22 22:07:19 +08:00
CCFontAtlasCache.h disable warn on zero-sized structures. 2014-07-14 17:53:55 +08: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 Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
CCFontFreeType.cpp close issue#5734:Label:The letters sometimes slightly cut. 2014-08-13 18:40:35 +08: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
CCGLBufferedNode.h
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 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
CCLabel.h add test case for new API of Label. 2014-06-18 18:01:55 +08:00
CCLabelAtlas.cpp check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07:00
CCLabelAtlas.h fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS 2014-07-15 15:26:37 +08:00
CCLabelBMFont.cpp bug fix 2014-08-02 08:04:29 +08:00
CCLabelBMFont.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTTF.cpp tab to spaces 2014-07-30 16:20:58 +08:00
CCLabelTTF.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTextFormatter.cpp fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
CCLabelTextFormatter.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCLayer.cpp fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
CCLayer.h change pure virtual function to virtual function in action series 2014-07-11 10:19:49 +08:00
CCMenu.cpp fixed memory leak cause by singleton. 2014-07-08 18:22:48 +08:00
CCMenu.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCMenuItem.cpp Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
CCMenuItem.h Fix compile errors on WP8 2014-07-11 15:10:19 +08: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 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
CCNode.h Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
CCNodeGrid.cpp rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
CCNodeGrid.h add CC_DLL 2014-07-15 12:00:31 +08:00
CCParallaxNode.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParallaxNode.h use CC_CONSTRUCTOR_ACCESS in ParallaxNode 2014-07-16 11:40:09 +08:00
CCParticleBatchNode.cpp rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +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 Update CCParticleSystem.cpp 2014-07-25 11:40:23 +08:00
CCParticleSystem.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCParticleSystemQuad.cpp set emission rate when setTotalParticles() 2014-07-29 10:48:20 +08:00
CCParticleSystemQuad.h Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 2014-07-09 23:03:04 +08: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
CCProtectedNode.cpp rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
CCProtectedNode.h Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
CCRenderTexture.cpp Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
CCRenderTexture.h add comment for the limit of RenderTextue::saveToFile 2014-08-13 10:14:26 +08:00
CCScene.cpp remove unused code 2014-08-14 19:07:40 +08:00
CCScene.h fix default camera, add listener for projection change 2014-08-12 14:42:08 +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 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +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 spaces 2014-07-29 17:22:13 +08:00
CCSpriteFrameCache.h add 2014-07-29 16:58:33 +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 add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08: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 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
CCTransitionPageTurn.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTransitionPageTurn.h move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
CCTransitionProgress.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransitionProgress.h add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
CCTweenFunction.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTweenFunction.h add CC_DLL 2014-07-15 12:00:31 +08:00
CMakeLists.txt Make CMake More Robust 2014-08-06 15:43:19 +01:00
cocos2d.def window dll version work now 2014-07-14 14:40:47 +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 fix winrt complie error 2014-08-07 18:38:11 +08:00
cocos2d_winrt.vcxproj.filters fix winrt complie error 2014-08-07 18:38:11 +08:00
cocos2d_winrt_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_wp8.vcxproj * Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project) 2014-08-14 15:35:36 +03:00
cocos2d_wp8.vcxproj.filters * Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project) 2014-08-14 15:35:36 +03:00
cocos2d_wp8_headers.props * Fixed WP8 compilation errors (added path to CCGLView.h) 2014-08-14 15:14:25 +03:00
cocos2dx.props
libcocos2d.vcxproj Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00
libcocos2d.vcxproj.filters Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00