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
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
..
libcocos2d_8_1 increase build heap memory option to /Zm384 2015-01-28 20:37:39 -08:00
winrt_8.1_props added ignore warning 4756 2014-10-27 11:07:27 -07:00
winrt_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
wp8_props added wp8 and winrt property sheets 2014-10-14 14:27:29 -07: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 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionCamera.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionCamera.h Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
CCActionCatmullRom.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionCatmullRom.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionEase.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionEase.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionGrid.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionGrid.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionGrid3D.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionGrid3D.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionInstant.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionInstant.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionInterval.cpp add Color3B type parameter to TintTo::create 2015-01-14 11:04:23 +02:00
CCActionInterval.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionManager.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCActionManager.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionPageTurn3D.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionPageTurn3D.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionProgressTimer.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionProgressTimer.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionTiledGrid.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionTiledGrid.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCActionTween.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCActionTween.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CCAnimation.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCAnimation.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
CCAnimationCache.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCache.h change pure virtual function to virtual function in action series 2014-07-11 10:19:49 +08:00
CCAtlasNode.cpp undeprecate init for custom command 2015-01-15 15:56:44 -08:00
CCAtlasNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCCamera.cpp add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
CCCamera.h add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
CCClippingNode.cpp add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
CCClippingNode.h - set const modifier to ClippingNode::hasContent() 2014-11-13 12:43:05 +02:00
CCClippingRectangleNode.cpp ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CCClippingRectangleNode.h ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CCComponent.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCComponent.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCComponentContainer.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCComponentContainer.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDrawNode.cpp add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
CCDrawNode.h fix crash on windows 2015-01-20 16:50:51 +08:00
CCDrawingPrimitives.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCDrawingPrimitives.h Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
CCFastTMXLayer.cpp Fixed lots of compiler warnings 2015-01-23 02:02:33 +01:00
CCFastTMXLayer.h change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
CCFastTMXTiledMap.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCFastTMXTiledMap.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCFont.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCFont.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontAtlas.cpp Fixed crash 2015-01-21 22:46:31 +08:00
CCFontAtlas.h Fixed label may become white/black block after resume from background on android 2015-01-21 21:58:18 +08:00
CCFontAtlasCache.cpp remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontAtlasCache.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontCharMap.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCFontCharMap.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCFontFNT.cpp Improved the parsing performance of bitmap fonts 2015-01-24 16:23:30 +08:00
CCFontFNT.h Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
CCFontFreeType.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCFontFreeType.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCGLBufferedNode.cpp
…
CCGLBufferedNode.h Platform fixed 2014-09-09 16:50:02 -07:00
CCGrabber.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCGrabber.h Platform fixed 2014-09-09 16:50:02 -07:00
CCGrid.cpp Fixed lots of compiler warnings 2015-01-23 02:02:33 +01:00
CCGrid.h Fix Vertex Z issue 2015-01-15 16:41:07 -08:00
CCLabel.cpp FIX for Build error when CC_USE_CULLING=0 #10373 2015-02-09 18:15:22 -08:00
CCLabel.h Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +08:00
CCLabelAtlas.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCLabelAtlas.h fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +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 fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +08:00
CCLabelTTF.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCLabelTTF.h fix warns and memory leak 2014-10-09 17:19:43 +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 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
CCLayer.cpp refactor the rendering and creation of DrawNode 2015-01-23 18:19:03 +08:00
CCLayer.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCLight.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCLight.h Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
CCMenu.cpp CMake fix for Mac Os X. 2014-10-15 00:19:29 +03:00
CCMenu.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCMenuItem.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCMenuItem.h fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
CCMotionStreak.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCMotionStreak.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCNode.cpp Merge pull request #10160 from lite3/wildpointer 2015-02-12 18:01:10 +08:00
CCNode.h Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix 2015-01-28 15:16:23 +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 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
CCParallaxNode.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParallaxNode.h Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
CCParticleBatchNode.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCParticleBatchNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCParticleExamples.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleExamples.h
…
CCParticleSystem.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCParticleSystem.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCParticleSystemQuad.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCParticleSystemQuad.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCProgressTimer.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCProgressTimer.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCProtectedNode.cpp add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
CCProtectedNode.h add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
CCRenderTexture.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCRenderTexture.h Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCScene.cpp adjust and remove unused code 2015-02-12 16:58:34 +08:00
CCScene.h add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
CCSprite.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCSprite.h add const for Sprite::getTextureRect() and do some format 2014-12-30 11:55:54 +08:00
CCSpriteBatchNode.cpp specify default capacity 2015-01-26 10:56:38 +09:00
CCSpriteBatchNode.h fix grammar in comment 2015-01-26 10:56:43 +09:00
CCSpriteFrame.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCSpriteFrame.h Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCSpriteFrameCache.cpp check if plist file exist 2015-01-21 14:36:49 +08:00
CCSpriteFrameCache.h Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCTMXLayer.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXLayer.h Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCTMXObjectGroup.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTMXObjectGroup.h make CCTMXObjectGroup::getGroupName const 2015-01-22 16:37:51 +09:00
CCTMXTiledMap.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXTiledMap.h add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +08:00
CCTMXXMLParser.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTMXXMLParser.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCTextFieldTTF.cpp Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCTextFieldTTF.h Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
CCTileMapAtlas.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCTileMapAtlas.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCTransition.cpp scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCTransition.h remove unneeded include header files 2014-08-27 13:39:50 +08:00
CCTransitionPageTurn.cpp new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCTransitionPageTurn.h new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
CCTransitionProgress.cpp Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
CCTransitionProgress.h add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
CCTweenFunction.cpp fix compiling error on windows 2014-08-27 15:13:41 +08:00
CCTweenFunction.h issue #9537:Make parameters more sense 2015-01-20 15:41:59 +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 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
libcocos2d.vcxproj.filters Fixed unwanted changes 2015-02-12 23:07:24 +01:00
libcocos2d_wp8.vcxproj increase build heap memory option to /Zm384 2015-01-28 20:32:32 -08:00
libcocos2d_wp8.vcxproj.filters modify WP8 project and update precompileshader 2015-01-14 02:15:04 +08:00