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
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 		2014-10-16 10:59:58 +08:00
..
libcocos2d_8_1 added Windows 8.1 universal app project files 2014-10-14 14:25:01 -07:00
winrt_8.1_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
winrt_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
wp8_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
wp_8.1_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07: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 Platform fixed 2014-09-09 16:50:02 -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 Platform fixed 2014-09-09 16:50:02 -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 new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCActionPageTurn3D.h new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08: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 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07: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 Fixed LabelAtlas opacity do not change when setting parent node's opacity 2014-10-08 18:28:24 +08:00
CCAtlasNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCClippingNode.cpp Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode 2014-09-23 17:35:57 +09:00
CCClippingNode.h Platform fixed 2014-09-09 16:50:02 -07:00
CCClippingRectangleNode.cpp ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CCClippingRectangleNode.h ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08: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 Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug 2014-10-11 17:31:17 +08:00
CCDrawNode.h Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
CCDrawingPrimitives.cpp fix warns and memory leak 2014-10-09 17:19:43 +08:00
CCDrawingPrimitives.h Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
CCFastTMXLayer.cpp change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
CCFastTMXLayer.h change indices to short for fast tmx 2014-09-17 11:06:15 +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 Label:It may display incorrectly with outline feature enabled. 2014-09-12 16:03:01 +08:00
CCFontAtlas.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07: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 Platform fixed 2014-09-09 16:50:02 -07:00
CCGrabber.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrabber.h Platform fixed 2014-09-09 16:50:02 -07:00
CCGrid.cpp new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCGrid.h new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCLabel.cpp fixed opacity of label 2014-10-09 10:54:35 +08:00
CCLabel.h Add protocolbuf.a 2014-10-09 18:28:09 +08:00
CCLabelAtlas.cpp Fixed LabelAtlas opacity do not change when setting parent node's opacity 2014-10-08 18:28:24 +08:00
CCLabelAtlas.h Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
CCLabelBMFont.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
CCLabelBMFont.h fix warns and memory leak 2014-10-09 17:19:43 +08:00
CCLabelTTF.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCLabelTTF.h fix warns and memory leak 2014-10-09 17:19:43 +08:00
CCLabelTextFormatter.cpp fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
CCLabelTextFormatter.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -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 CMake fix for Mac Os X. 2014-10-15 00:19:29 +03:00
CCMenu.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCMenuItem.cpp fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
CCMenuItem.h fix memory leak when use menu_selector. 2014-09-14 21:41: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 added missing CC_USE_PHYSICS 2014-10-14 14:12:27 -07:00
CCNode.h Merge pull request #8209 from boyu0/fix_physics_crash 2014-10-08 13:48:03 +08:00
CCNodeGrid.cpp remove orderOfArrival = 0 2014-09-11 15:44:31 +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 remove Node::_setLocalZOrder() 2014-09-03 17:26:50 +08: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 optimise update of particle system for free mode 2014-09-18 15:24:27 +08: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 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
CCProtectedNode.h add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
CCRenderTexture.cpp remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
CCRenderTexture.h Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCScene.cpp move render logic from Director to scene 2014-09-26 09:36:43 +08:00
CCScene.h move light from 3d to base 2014-09-28 16:02:12 +08:00
CCSprite.cpp * added default value for _batchNode in CCSprite 2014-09-22 19:00:21 +03:00
CCSprite.h fix compile error when CC_SPRITE_DEBUG_DRAW 2014-09-26 17:14:55 +08:00
CCSpriteBatchNode.cpp fixed opacity of label 2014-10-09 10:54:35 +08: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 add implementation for staggered tmx map 2014-10-11 14:22:31 +08:00
CCTMXLayer.h add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +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 add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +08:00
CCTMXXMLParser.cpp add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +08:00
CCTMXXMLParser.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCTextFieldTTF.cpp fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +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 scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCTransition.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCTransitionPageTurn.cpp new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCTransitionPageTurn.h new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +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 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
CMakeLists.txt Merge pull request #8700 from iSevenDays/v3 2014-10-15 21:24:18 +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 fix cocostudio include path 2014-10-10 13:48:49 +08:00
cocos2dx.props restore some configs 2014-09-04 10:49:45 +08:00
libcocos2d.vcxproj Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 2014-10-16 10:59:58 +08:00
libcocos2d.vcxproj.filters Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 2014-10-16 10:59:58 +08:00
libcocos2d_wp8.vcxproj added missing protobuf-lite files 2014-10-14 17:41:40 -07:00
libcocos2d_wp8.vcxproj.filters added missing protobuf-lite files 2014-10-14 17:41:40 -07:00