Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d
History
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
..
CCAction.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
CCAction.h Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
CCActionCamera.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -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 Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionCatmullRom.h remove unneeded codes 2014-08-26 18:19:28 +08:00
CCActionEase.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionEase.h convert indention to space 2014-07-18 14:53:00 +08:00
CCActionGrid.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionGrid.h Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
CCActionGrid3D.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionGrid3D.h Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
CCActionInstant.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCActionInstant.h remove unneeded codes 2014-08-26 18:19:28 +08:00
CCActionInterval.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCActionInterval.h remove unneeded codes 2014-08-26 18:19:28 +08:00
CCActionManager.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCActionManager.h Merge pull request #7558 from newnon/v3_actions_by_tag_improvements 2014-08-28 14:24:37 +08:00
CCActionPageTurn3D.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionPageTurn3D.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionProgressTimer.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionProgressTimer.h coding style fix 2014-05-28 17:41:34 +08:00
CCActionTiledGrid.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionTiledGrid.h Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
CCActionTween.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCActionTween.h coding style fix 2014-05-28 17:41:34 +08:00
CCAnimation.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimation.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCache.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCache.h change pure virtual function to virtual function in action series 2014-07-11 10:19:49 +08:00
CCAtlasNode.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCAtlasNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCClippingNode.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCClippingNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCComponent.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCComponent.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCComponentContainer.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCComponentContainer.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDrawNode.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCDrawNode.h Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions 2014-07-28 10:39:35 +08:00
CCDrawingPrimitives.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCDrawingPrimitives.h add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
CCFastTMXLayer.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFastTMXLayer.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCFastTMXTiledMap.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFastTMXTiledMap.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCFont.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCFont.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontAtlas.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCFontAtlas.h fix compiling error on windows 2014-08-27 15:13:41 +08:00
CCFontAtlasCache.cpp remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontAtlasCache.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontCharMap.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCFontCharMap.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontFNT.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFontFNT.h Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
CCFontFreeType.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCFontFreeType.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCGLBufferedNode.cpp
…
CCGLBufferedNode.h
…
CCGrabber.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrabber.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCGrid.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrid.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCLabel.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCLabel.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCLabelAtlas.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCLabelAtlas.h Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
CCLabelBMFont.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCLabelBMFont.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCLabelTTF.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07: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 remove unneeded includes 2014-08-29 15:39:52 +08:00
CCLayer.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCMenu.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
CCMenu.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCMenuItem.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCMenuItem.h Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
CCMotionStreak.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCMotionStreak.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCNode.cpp fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
CCNode.h fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
CCNodeGrid.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCNodeGrid.h Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
CCParallaxNode.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParallaxNode.h Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
CCParticleBatchNode.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCParticleBatchNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParticleExamples.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleExamples.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCParticleSystem.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCParticleSystem.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleSystemQuad.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleSystemQuad.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCProgressTimer.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCProgressTimer.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCProtectedNode.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCProtectedNode.h add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
CCRenderTexture.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCRenderTexture.h Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCScene.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCScene.h fix conflict 2014-08-27 13:50:01 +08:00
CCSprite.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCSprite.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCSpriteBatchNode.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCSpriteBatchNode.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCSpriteFrame.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCSpriteFrame.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCSpriteFrameCache.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCSpriteFrameCache.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXLayer.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTMXLayer.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXObjectGroup.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXObjectGroup.h Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
CCTMXTiledMap.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTMXTiledMap.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXXMLParser.cpp fix compiling error on windows 2014-08-29 16:44:20 +08:00
CCTMXXMLParser.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCTextFieldTTF.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTextFieldTTF.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCTileMapAtlas.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTileMapAtlas.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTransition.cpp fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
CCTransition.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCTransitionPageTurn.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCTransitionPageTurn.h move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
CCTransitionProgress.cpp fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
CCTransitionProgress.h add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
CCTweenFunction.cpp fix compiling error on windows 2014-08-27 15:13:41 +08:00
CCTweenFunction.h remove unneeded codes 2014-08-26 18:19:28 +08:00
cocos2d.def - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
cocos2d_headers.props restore some configs 2014-09-04 10:49:45 +08:00
cocos2d_winrt.props
…
cocos2d_winrt.vcxproj + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
cocos2d_winrt.vcxproj.filters + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
cocos2d_winrt_headers.props Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d_wp8.vcxproj * [WP8] Fixed project compilation. Removed references to deleted source files 2014-08-28 13:47:14 +03:00
cocos2d_wp8.vcxproj.filters * [WP8] Fixed project compilation. Removed references to deleted source files 2014-08-28 13:47:14 +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 restore some configs 2014-09-04 10:49:45 +08:00
libcocos2d.vcxproj merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
libcocos2d.vcxproj.filters merge cocos reslove conflict 2014-09-04 17:40:14 +08:00