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
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 		2015-06-10 10:16:42 +08:00
..
libcocos2d_8_1 Merge branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
libcocos2d_win10 added ogg support for Windows 10 UWP 2015-06-04 14:42:11 -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 TintBy::clone() incorrect cast 2015-06-04 10:13:34 +02: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
CCCamera.cpp Merge branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
CCCamera.h Merge branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
CCClippingNode.cpp Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms. 2015-05-01 12:36:19 +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 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 Optimize Vec3 2015-04-05 13:09:50 +03: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 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 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 characters with outline not on the same base line. 2015-05-11 18:05:03 +08:00
CCFontFreeType.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
CCGrid.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCLabel.cpp removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 letter spacing may be wrong. 2015-06-03 16:28:44 +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 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07: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 Merge pull request #12179 from WenhaiLin/v3-37-physics-ap 2015-06-08 16:12:56 +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 Material uses new file format 2015-05-11 21:31:33 -07: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 branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
CCScene.h Add limited macro for related Physic3D 2015-05-11 15:34:37 +08:00
CCSprite.cpp use trianglescommand for sprite 2015-05-22 15:54:56 +08:00
CCSprite.h use trianglescommand for sprite 2015-05-22 15:54:56 +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 assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +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 spritepolygon 2015-04-28 11:26:21 +08:00
MarchingSquare.cpp fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07:00
MarchingSquare.h merge the start and end points 2015-04-27 16:33:54 +08:00
SpritePolygon.cpp Fixed compile error on VS 2012. 2015-04-28 10:35:21 +08:00
SpritePolygon.h Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
SpritePolygonCache.cpp Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 17:18:26 +08:00
SpritePolygonCache.h Update SpritePolygon 2015-04-27 15:19:26 +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 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject 2015-05-26 12:06:05 +08:00
libcocos2d.vcxproj.filters add Android 9-patch image format support 2015-05-21 16:04:37 +08:00