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
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 		2015-07-21 11:39:24 +08:00
..
libcocos2d_8_1 Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
libcocos2d_win10 Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09: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 added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02:00
CCAction.h added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02: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 more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCActionEase.h Add EaseRateAction::create() method. 2015-04-24 18:31:44 +08:00
CCActionGrid.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08: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 add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCActionInterval.h Add Animate:getCurrentFrameIndex 2015-07-13 10:40:43 +08:00
CCActionManager.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCActionManager.h added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02: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
…
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 Merge pull request #12603 from jianglong0156/autoPolygonFileEncode 2015-06-30 16:29:44 +08:00
CCCamera.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCCamera.h Merge branch 'v3' into v3FrameBufferObject 2015-06-10 10:16:42 +08:00
CCClippingNode.cpp Fixes some warnings and a related bug in CCSprite. 2015-07-07 23:01:24 +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 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
CCDrawNode.h Add a setter for line width in DrawNode 2015-07-07 18:48:02 +09:00
CCDrawingPrimitives.cpp remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08: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 fix tons of warnings 2015-07-15 12:04:48 +08:00
CCFontAtlas.h Label:Fixed the characters are displayed incorrect with "dark roast.ttf" 2015-07-03 18:08:32 +08:00
CCFontAtlasCache.cpp
…
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 create fail if the font(TTF) not contain a Unicode charmap. 2015-07-10 14:39:21 +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
…
CCGrabber.h [ci skip]Update comments 2015-03-27 15:25:44 +08:00
CCGrid.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCGrid.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCLabel.cpp Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
CCLabel.h Label:Fixed system font may be invisible when there are multiple cameras. 2015-07-17 17:45:11 +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 Label:improving the code readability. 2015-07-14 11:30:56 +08:00
CCLabelTTF.h Label:improving the code readability. 2015-07-14 11:30:56 +08:00
CCLabelTextFormatter.cpp Rollback pr12299 2015-07-13 11:32:25 +08:00
CCLabelTextFormatter.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCLayer.cpp remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08: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 add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08: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 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
CCMotionStreak.h Fix comment. 2015-04-13 19:24:19 +03:00
CCNode.cpp Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-21 11:39:24 +08:00
CCNode.h Merge pull request #11995 from MAUSMAUSgames/v3 2015-07-13 22:19:03 +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 Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +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 add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +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 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-21 11:39:24 +08:00
CCProtectedNode.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCRenderTexture.cpp fixed renderTexture switch foreground to background issue. 2015-07-15 13:47:10 +08:00
CCRenderTexture.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCScene.cpp Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
CCScene.h Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
CCSprite.cpp Merge pull request #12863 from fusijie/fix_polygonsprite_setColor 2015-07-16 14:51:06 +08:00
CCSprite.h Update comments. 2015-07-08 15:30:34 +08:00
CCSpriteBatchNode.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-01 14:58:06 +08: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 add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08: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
…
CCTileMapAtlas.h [ci skip] Add javascript notes... 2015-03-28 14:28:16 +08:00
CCTransition.cpp Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
CCTransition.h Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
CCTransitionPageTurn.cpp
…
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
…
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
…
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 Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
libcocos2d.vcxproj.filters Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00