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
WuHao c7e990dcae Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 
Conflicts:
	cocos/2d/SpritePolygon.cpp
 		2015-04-27 13:39:41 +08:00
..
libcocos2d_8_1 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
winrt_8.1_props Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
winrt_props Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
wp_8.1_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
CCAction.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCAction.h Add comments 2015-03-27 11:39:31 +08:00
CCActionCamera.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCActionCamera.h Update comment for Lua 2015-03-30 15:47:47 +08:00
CCActionCatmullRom.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCActionCatmullRom.h Add comments 2015-03-27 11:39:31 +08:00
CCActionEase.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionEase.h Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
CCActionGrid.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionGrid.h Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
CCActionGrid3D.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCActionGrid3D.h Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
CCActionInstant.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionInstant.h update comments. 2015-03-27 12:07:19 +08:00
CCActionInterval.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCActionInterval.h fix doxygen comment 2015-03-27 17:09:54 +08:00
CCActionManager.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCActionManager.h Add javascript notes... 2015-03-19 18:41:11 +08:00
CCActionPageTurn3D.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionPageTurn3D.h Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
CCActionProgressTimer.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionProgressTimer.h Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
CCActionTiledGrid.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCActionTiledGrid.h Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
CCActionTween.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionTween.h Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
CCAnimation.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCAnimation.h Add comments 2015-03-27 11:39:31 +08:00
CCAnimationCache.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCache.h add comments. 2015-03-21 17:06:26 +08:00
CCAtlasNode.cpp undeprecate init for custom command 2015-01-15 15:56:44 -08:00
CCAtlasNode.h add comments. 2015-03-21 17:06:26 +08:00
CCCamera.cpp reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
CCCamera.h fix doxygen comment 2015-03-27 17:09:54 +08:00
CCClippingNode.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCClippingNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCClippingRectangleNode.cpp ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CCClippingRectangleNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCComponent.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCComponent.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCComponentContainer.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCComponentContainer.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCDrawNode.cpp Optimize Vec3 2015-04-05 13:09:50 +03:00
CCDrawNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCDrawingPrimitives.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCDrawingPrimitives.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCFastTMXLayer.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCFastTMXLayer.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCFastTMXTiledMap.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFastTMXTiledMap.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCFont.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCFont.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontAtlas.cpp Fixed crash 2015-01-21 22:46:31 +08:00
CCFontAtlas.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontAtlasCache.cpp remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontAtlasCache.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontCharMap.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCFontCharMap.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontFNT.cpp Improved the parsing performance of bitmap fonts 2015-01-24 16:23:30 +08:00
CCFontFNT.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontFreeType.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCFontFreeType.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCGLBufferedNode.cpp
…
CCGLBufferedNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCGrabber.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrabber.h [ci skip]Update comments 2015-03-27 15:25:44 +08:00
CCGrid.cpp Fixed lots of compiler warnings 2015-01-23 02:02:33 +01:00
CCGrid.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCLabel.cpp Label:Fixed the shadow color of system font may be incorrect. 2015-04-17 15:42:41 +08:00
CCLabel.h Label:disableEffect(LabelEffect::XXXX) support disable all effect. 2015-04-17 14:39:52 +08:00
CCLabelAtlas.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCLabelAtlas.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCLabelBMFont.cpp fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +08:00
CCLabelBMFont.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCLabelTTF.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCLabelTTF.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCLabelTextFormatter.cpp * fixed android crash that a Label instance add to an invisibility parent node. 2014-11-27 10:59:47 +08:00
CCLabelTextFormatter.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCLayer.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCLayer.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCLight.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCLight.h Merge pull request #11027 from tangziwen/doc 2015-03-23 10:45:41 +08:00
CCMenu.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCMenu.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCMenuItem.cpp MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
CCMenuItem.h MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
CCMotionStreak.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCMotionStreak.h Fix comment. 2015-04-13 19:24:19 +03:00
CCNode.cpp 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-04-21 19:38:38 +08:00
CCNode.h Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached. 2015-04-10 17:01:21 +08:00
CCNodeGrid.cpp Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
CCNodeGrid.h add comments. 2015-03-21 17:06:26 +08:00
CCParallaxNode.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParallaxNode.h [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
CCParticleBatchNode.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCParticleBatchNode.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCParticleExamples.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParticleExamples.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCParticleSystem.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParticleSystem.h update comments. 2015-03-27 12:07:19 +08:00
CCParticleSystemQuad.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParticleSystemQuad.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCProgressTimer.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCProgressTimer.h add comments. 2015-03-21 17:06:26 +08:00
CCProtectedNode.cpp setCameraMask for cocostudio-ui 2015-02-12 09:24:04 +08:00
CCProtectedNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCRenderTexture.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCRenderTexture.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCScene.cpp Physics: Fixed position of physics body is wrong when the position of parent node changes 2015-04-10 15:39:39 +08:00
CCScene.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCSprite.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCSprite.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCSpriteBatchNode.cpp specify default capacity 2015-01-26 10:56:38 +09:00
CCSpriteBatchNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCSpriteFrame.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCSpriteFrame.h update comments. 2015-03-27 12:07:19 +08:00
CCSpriteFrameCache.cpp fix 2015-04-24 11:40:15 +08:00
CCSpriteFrameCache.h fix 2015-04-24 11:40:15 +08:00
CCTMXLayer.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCTMXLayer.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCTMXObjectGroup.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCTMXObjectGroup.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCTMXTiledMap.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXTiledMap.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCTMXXMLParser.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCTMXXMLParser.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCTextFieldTTF.cpp Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCTextFieldTTF.h Merge branch 'v3' into fix-remaining-missing-comments 2015-03-30 10:56:42 +08:00
CCTileMapAtlas.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTileMapAtlas.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCTransition.cpp scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCTransition.h Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
CCTransitionPageTurn.cpp new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCTransitionPageTurn.h update comments. 2015-03-27 12:07:19 +08:00
CCTransitionProgress.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTransitionProgress.h [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
CCTweenFunction.cpp fix compiling error on windows 2014-08-27 15:13:41 +08:00
CCTweenFunction.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CMakeLists.txt Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
MarchingSquare.cpp fixed anchor point issue, removed rect rotated property 2015-04-24 18:17:12 +08:00
MarchingSquare.h Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
SpritePolygon.cpp Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 13:39:41 +08:00
SpritePolygon.h fixed some SpritePolygon create, added more tests 2015-04-27 13:34:47 +08:00
SpritePolygonCache.cpp Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 13:39:41 +08:00
SpritePolygonCache.h Update SpritePolygonCache 2015-04-27 11:57:36 +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 freetype include 2015-04-08 09:24:34 +08:00
cocos2dx.props restore some configs 2014-09-04 10:49:45 +08:00
libcocos2d.vcxproj Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
libcocos2d.vcxproj.filters Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00