axmol/cocos/2d
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
..
libcocos2d_8_1 moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
libcocos2d_win10 added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
win10_props added ogg support for Windows 10 UWP 2015-06-04 14:42:11 -07:00
winrt_8.1_props Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07: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 Fix typo. angel -> angle 2015-05-21 09:22:59 +09: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 Add EaseRateAction::create() method. 2015-04-24 18:31:44 +08:00
CCActionEase.h Add EaseRateAction::create() method. 2015-04-24 18:31:44 +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 Merge pull request #12162 from namezero111111/patch-4 2015-06-16 13:37:04 +08:00
CCActionInterval.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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
CCAutoPolygon.cpp Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-11 14:39:35 +08:00
CCAutoPolygon.h [ci skip]Fixed warns 2015-06-25 10:53:41 +08:00
CCCamera.cpp remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
CCCamera.h Merge branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
CCClippingNode.cpp remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
CCClippingNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCClippingRectangleNode.cpp RenderState: default state fixes 2015-06-12 15:03:48 -07:00
CCClippingRectangleNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCComponent.cpp Fix jsbinding calls for CCComponent 2015-06-04 15:59:05 +08:00
CCComponent.h 1, modify space format. 2015-06-04 14:08:47 +08:00
CCComponentContainer.cpp 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
CCComponentContainer.h add physics3d support 2015-05-08 15:49:33 +08:00
CCDrawNode.cpp Fix drawLine & drawPoints won't use blendFunc bug 2015-07-03 11:30:38 +08:00
CCDrawNode.h Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
CCDrawingPrimitives.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCDrawingPrimitives.h Fix typo. angel -> angle 2015-05-21 09:22:59 +09: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 experimental::TileMap:Fixed crash if referring a non-existent layer in TMX. 2015-05-22 11:14:34 +08: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 Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
CCFontCharMap.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontFNT.cpp Renamed shadowed variables to reduce confusion when reading source code 2015-04-20 22:57:55 -04:00
CCFontFNT.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCFontFreeType.cpp Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +08:00
CCFontFreeType.h Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +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 RenderState: default state fixes 2015-06-12 15:03:48 -07:00
CCGrid.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCLabel.cpp Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +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 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
CCLabelTextFormatter.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCLayer.cpp removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
CCLayer.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
CCMenu.h Issue #10570: Make getItemForTouch of Menu virtual. 2015-05-28 11:41:49 +08:00
CCMenuItem.cpp removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
CCMenuItem.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 fix the bug of light 2015-06-17 11:17:46 +08:00
CCNode.h Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body. 2015-06-04 14:57:37 +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 Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner. 2015-06-12 11:03:32 +08:00
CCParticleSystem.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 Fix setSprite never updating progress on ProgressTimer 2015-05-03 14:35:50 -04: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 origin code of viewport 2015-06-01 14:26:08 +08:00
CCRenderTexture.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCScene.cpp merge cocos 2015-06-11 15:54:42 +08:00
CCScene.h decopule physics and navmesh from Director 2015-06-09 13:49:07 +08:00
CCSprite.cpp fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
CCSprite.h deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +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 template android compilation issue on physics3d 2015-06-10 19:37:52 +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 Crash fix for referring a non-existent layer in tmx. 2015-05-20 11:29:52 +08: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 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 fix compile error for linux 2015-06-18 11:15:45 +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 Add $(EngineRoot)external for cocos2d_headers.props 2015-05-07 11:11:33 +08:00
cocos2dx.props add vs2015 support 2015-05-21 13:55:01 +08:00
libcocos2d.vcxproj Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 2015-06-15 16:13:36 +08:00
libcocos2d.vcxproj.filters Fixed warn 2015-06-18 14:24:52 +08:00