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
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 
Conflicts:
	cocos/2d/CCNode.h
 		2015-03-27 13:43:38 +08:00
..
libcocos2d_8_1 merge cocos 2015-03-26 12:50:18 +08:00
winrt_8.1_props disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
winrt_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
wp8_props disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
wp_8.1_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
CCAction.cpp Cleaned up CCAction.cpp 2015-02-12 21:00:12 -08:00
CCAction.h Add comments 2015-03-27 11:39:31 +08:00
CCActionCamera.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionCamera.h Add comments 2015-03-27 11:39:31 +08:00
CCActionCatmullRom.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09: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 Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09: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 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
CCActionInterval.h update comments. 2015-03-27 12:07:19 +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 Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09: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 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
CCClippingNode.cpp override setCameraMask 2015-03-16 17:11:17 +08:00
CCClippingNode.h add comments. 2015-03-21 17:06:26 +08:00
CCClippingRectangleNode.cpp ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CCClippingRectangleNode.h Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +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]Update comments 2015-03-24 20:23:51 +08:00
CCDrawNode.cpp add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
CCDrawNode.h add comments. 2015-03-21 17:06:26 +08:00
CCDrawingPrimitives.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCDrawingPrimitives.h add comments. 2015-03-21 17:06:26 +08:00
CCFastTMXLayer.cpp Fixed lots of compiler warnings 2015-01-23 02:02:33 +01:00
CCFastTMXLayer.h add comments. 2015-03-21 17:06:26 +08:00
CCFastTMXTiledMap.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFastTMXTiledMap.h add comments. 2015-03-21 17:06:26 +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]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
CCGrabber.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrabber.h [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
CCGrid.cpp Fixed lots of compiler warnings 2015-01-23 02:02:33 +01:00
CCGrid.h [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
CCLabel.cpp add comment 2015-03-18 11:58:36 +08:00
CCLabel.h [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
CCLabelAtlas.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCLabelAtlas.h [ci skip]Update comments 2015-03-24 14:12:58 +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 refactor the rendering and creation of DrawNode 2015-01-23 18:19:03 +08: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 CMake fix for Mac Os X. 2014-10-15 00:19:29 +03:00
CCMenu.h Add missing comments for UI modules 2015-03-25 18:17:58 +08:00
CCMenuItem.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCMenuItem.h Add missing comments for UI modules 2015-03-25 18:17:58 +08:00
CCMotionStreak.cpp MotionStreak MoveTo/MoveBy action OK 2015-01-29 19:30:00 +09:00
CCMotionStreak.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCNode.cpp Merge pull request #10160 from lite3/wildpointer 2015-02-12 18:01:10 +08:00
CCNode.h Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-27 13:43:38 +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 remove unneeded includes 2014-08-28 17:03:29 +08: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 remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleExamples.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCParticleSystem.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCParticleSystem.h update comments. 2015-03-27 12:07:19 +08:00
CCParticleSystemQuad.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCParticleSystemQuad.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCProgressTimer.cpp Refactor draw command 2015-01-15 14:00:49 -08: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 Add missing comments for UI modules 2015-03-25 18:17:58 +08:00
CCRenderTexture.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCRenderTexture.h Add comments 2015-03-27 11:39:31 +08:00
CCScene.cpp fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
CCScene.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCSprite.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCSprite.h Add comments 2015-03-27 11:39:31 +08:00
CCSpriteBatchNode.cpp specify default capacity 2015-01-26 10:56:38 +09:00
CCSpriteBatchNode.h add comments. 2015-03-21 17:06:26 +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 check if plist file exist 2015-01-21 14:36:49 +08:00
CCSpriteFrameCache.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +08:00
CCTMXLayer.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXLayer.h Add comments 2015-03-27 11:39:31 +08:00
CCTMXObjectGroup.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXObjectGroup.h Add comments 2015-03-27 11:39:31 +08:00
CCTMXTiledMap.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXTiledMap.h Add comments 2015-03-27 11:39:31 +08:00
CCTMXXMLParser.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09: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 fix group error 2015-03-26 15:47:14 +08:00
CCTileMapAtlas.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTileMapAtlas.h Add missing comments for UI modules 2015-03-25 18:17:58 +08:00
CCTransition.cpp scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCTransition.h Merge pull request #11092 from fusijie/cocosapi 2015-03-24 11:27:54 +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 Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +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 cocos 2015-03-26 11:59:26 +08:00
libcocos2d.vcxproj.filters merge cocos 2015-03-26 11:59:26 +08:00
libcocos2d_wp8.vcxproj config wp8 and add comment 2015-03-26 18:10:42 +08:00
libcocos2d_wp8.vcxproj.filters config wp8 and add comment 2015-03-26 18:10:42 +08:00