axmol/cocos/2d
pandamicro 65f4c23004 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 13:56:09 +08:00
..
platform Merge pull request #5980 from Dhilan007/develop_label2 2014-03-26 16:32:04 +08:00
renderer closed #4552: change assert log message 2014-03-26 10:07:50 +08:00
Android.mk Compiles on Android 2014-03-04 16:59:39 -08:00
CCAction.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCAction.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionCamera.cpp Nodes: setAdditionalTransform() receives a pointer 2014-03-01 08:26:54 -08:00
CCActionCamera.h Camera and Node fixes 2014-01-13 12:52:07 -08:00
CCActionCatmullRom.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionCatmullRom.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionEase.cpp fix ease elastic action error 2014-03-08 21:51:17 +08:00
CCActionEase.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionGrid.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionGrid.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionGrid3D.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionGrid3D.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionInstant.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionInstant.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionInterval.cpp fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCActionInterval.h fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCActionManager.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionManager.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionPageTurn3D.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionPageTurn3D.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionProgressTimer.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionProgressTimer.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionTiledGrid.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionTiledGrid.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCActionTween.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionTween.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCAnimation.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCAnimation.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCAnimationCache.cpp Merge pull request #4947 from walzer/develop 2014-01-06 19:50:18 -08:00
CCAnimationCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCAtlasNode.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCAtlasNode.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCClippingNode.cpp closed #4315: fixed clippingNode alphaTest Bug 2014-03-10 15:12:44 +08:00
CCClippingNode.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCComponent.cpp remove isRenderer. 2014-03-26 17:02:37 +08:00
CCComponent.h remove isRenderer. 2014-03-26 17:02:37 +08:00
CCComponentContainer.cpp add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
CCComponentContainer.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCConfiguration.cpp Merge pull request #4990 from daltomi/debug 2014-02-20 20:29:56 +08:00
CCConfiguration.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDeprecated.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCDeprecated.h added WP8 and WINRT platforms 2014-03-22 05:53:09 -07:00
CCDirector.cpp added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added 2014-03-22 05:55:08 -07:00
CCDirector.h added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added 2014-03-22 05:55:08 -07:00
CCDrawNode.cpp onDraw() updated 2014-03-05 15:49:08 -08:00
CCDrawNode.h fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCDrawingPrimitives.cpp GL Program API fixes 2014-03-04 13:51:43 -08:00
CCDrawingPrimitives.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEvent.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEvent.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCEventAcceleration.cpp issue #4234: Acceleration -> const Acceleration& 2014-03-04 13:42:36 +08:00
CCEventAcceleration.h issue #4234: Acceleration -> const Acceleration& 2014-03-04 13:42:36 +08:00
CCEventCustom.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventCustom.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventDispatcher.cpp Find another instance where we should null out the node pointer for the current listener after it has been disassociated with the node. 2014-03-27 20:11:37 -07:00
CCEventDispatcher.h Review feedback: Wrap the debug verification in additional macros which are disabled by default. 2014-03-27 12:29:28 -07:00
CCEventKeyboard.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventKeyboard.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListener.cpp More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
CCEventListener.h More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
CCEventListenerAcceleration.cpp More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
CCEventListenerAcceleration.h More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
CCEventListenerCustom.cpp More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
CCEventListenerCustom.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCEventListenerKeyboard.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerKeyboard.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerMouse.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerMouse.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerTouch.cpp Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
CCEventListenerTouch.h Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
CCEventMouse.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventMouse.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventTouch.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventTouch.h issue #4129: EventTouch::getTouches return const reference. 2014-02-28 15:08:18 +08:00
CCEventType.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCFont.cpp Merge pull request #5254 from Dhilan007/develop_label 2014-01-26 21:59:22 -08:00
CCFont.h fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
CCFontAtlas.cpp closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CCFontAtlas.h closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CCFontAtlasCache.cpp label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
CCFontAtlasCache.h Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
CCFontCharMap.cpp remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
CCFontCharMap.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +08:00
CCFontFNT.cpp remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
CCFontFNT.h remove CC prefix. 2014-02-21 09:59:43 +08:00
CCFontFreeType.cpp using 'struct' for reduce looks up in the map. 2014-03-28 09:44:16 +08:00
CCFontFreeType.h closed #4561:Fixed read file more than once for label created by different font size. 2014-03-27 17:04:05 +08:00
CCGLBufferedNode.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGLBufferedNode.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGLProgram.cpp Merge pull request #5977 from dabingnn/develop_fixID_Android_bug 2014-03-27 13:49:53 +08:00
CCGLProgram.h Merge pull request #5977 from dabingnn/develop_fixID_Android_bug 2014-03-27 13:49:53 +08:00
CCGrabber.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGrabber.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCGrid.cpp Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
CCGrid.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCIMEDelegate.h fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
CCIMEDispatcher.cpp fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
CCIMEDispatcher.h fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
CCLabel.cpp fixed got wrong Rect by Label::getBoundingBox. 2014-03-28 11:03:39 +08:00
CCLabel.h fixed got wrong Rect by Label::getBoundingBox. 2014-03-28 11:03:39 +08:00
CCLabelAtlas.cpp LabelAtlas:fixed display incorrect color. 2014-03-14 17:36:05 +08:00
CCLabelAtlas.h LabelAtlas:fixed display incorrect color. 2014-03-14 17:36:05 +08:00
CCLabelBMFont.cpp label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
CCLabelBMFont.h LabelBMFont re-implemented as a wrapper of Label. 2014-02-20 22:33:52 +08:00
CCLabelTTF.cpp label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
CCLabelTTF.h fixed label font size: from int to float 2014-03-20 15:03:48 +08:00
CCLabelTextFormatter.cpp label:support clip blank of upper and lower margin. 2014-03-24 14:16:27 +08:00
CCLabelTextFormatter.h 1.remove unused code 2014-01-22 14:57:11 +08:00
CCLayer.cpp Fixed #4566: Fix coding style problems 2014-03-27 10:01:46 +08:00
CCLayer.h Fixed #4566: Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section 2014-03-27 10:55:41 +08:00
CCMenu.cpp fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCMenu.h fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCMenuItem.cpp Label:fixed shadow offset didn't consider 'contentScaleFactor' 2014-03-25 10:41:53 +08:00
CCMenuItem.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCMotionStreak.cpp Issue #4294: MotionStreak: Improve position setters 2014-03-07 19:06:51 +08:00
CCMotionStreak.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCNode.cpp Review feedback: Wrap the debug verification in additional macros which are disabled by default. 2014-03-27 12:29:28 -07:00
CCNode.h issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
CCNodeGrid.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCNodeGrid.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCNotificationCenter.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCNotificationCenter.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCParallaxNode.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCParallaxNode.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCParticleBatchNode.cpp Fix partical test->add and remove particle system crash. 2014-03-05 14:32:22 +08:00
CCParticleBatchNode.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCParticleExamples.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCParticleExamples.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCParticleSystem.cpp closed #4573: Set particle visible to false then set to true cause crashes. 2014-03-27 16:47:21 +08:00
CCParticleSystem.h Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes 2014-03-26 13:58:46 +08:00
CCParticleSystemQuad.cpp closed #4573: Set particle visible to false then set to true cause crashes. 2014-03-27 16:47:21 +08:00
CCParticleSystemQuad.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCProfiling.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
CCProfiling.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCProgressTimer.cpp onDraw() updated 2014-03-05 15:49:08 -08:00
CCProgressTimer.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCProtocols.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCRenderTexture.cpp RenderTexture saveToFile will return true 2014-03-10 17:42:27 +08:00
CCRenderTexture.h migrate saveToFile compatible with new renderer 2014-03-07 17:41:51 +08:00
CCScene.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCScene.h Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
CCScheduler.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix 2014-03-05 09:52:37 +08:00
CCScheduler.h Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 19:12:59 +08:00
CCScriptSupport.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
CCScriptSupport.h fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCShaderCache.cpp Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
CCShaderCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSprite.cpp remove unused params warnings 2014-03-20 16:34:42 +08:00
CCSprite.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCSpriteBatchNode.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCSpriteBatchNode.h change access specifier of SpriteBatchNode::addSpriteWithoutQuad. 2014-03-17 19:31:58 +08:00
CCSpriteFrame.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCSpriteFrame.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSpriteFrameCache.cpp deprecated some functions in Object 2014-01-22 13:47:29 +08:00
CCSpriteFrameCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTMXLayer.cpp remove warnings under win32 2014-03-24 10:12:40 +08:00
CCTMXLayer.h more cleanup in TMX code 2014-02-07 18:33:30 -08:00
CCTMXObjectGroup.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTMXObjectGroup.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTMXTiledMap.cpp Merge pull request #5279 from edba/develop 2014-02-10 12:19:47 -08:00
CCTMXTiledMap.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCTMXXMLParser.cpp Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 2014-02-24 22:23:05 +08:00
CCTMXXMLParser.h Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index 2014-02-24 20:09:11 +08:00
CCTextFieldTTF.cpp Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 2014-03-25 13:46:17 +08:00
CCTextFieldTTF.h Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 2014-03-25 13:46:17 +08:00
CCTexture2D.cpp closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CCTexture2D.h closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CCTextureAtlas.cpp removes CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP support 2014-02-28 22:09:18 -08:00
CCTextureAtlas.h closed #3684, Set shader program before TextureAtlas is rendered. 2014-02-28 11:43:41 +08:00
CCTextureCache.cpp closed #2880, Generate mipmap for the texture has mipmaps when reload textures. 2014-03-25 16:19:34 +08:00
CCTextureCache.h closed #2880, Generate mipmap for the texture has mipmaps when reload textures. 2014-03-25 16:19:34 +08:00
CCTileMapAtlas.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTileMapAtlas.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTouch.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTouch.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTransition.cpp fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCTransition.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCTransitionPageTurn.cpp fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCTransitionPageTurn.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCTransitionProgress.cpp fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCTransitionProgress.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTweenFunction.cpp fix ease action error 2014-03-13 19:53:06 +08:00
CCTweenFunction.h fix ease elastic action error 2014-03-08 21:51:17 +08:00
CCUserDefault.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCUserDefault.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCUserDefault.mm update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCUserDefaultAndroid.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCVertex.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCVertex.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CMakeLists.txt fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
TGAlib.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
TGAlib.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
TransformUtils.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
TransformUtils.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ZipUtils.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ZipUtils.h added CC_PLATFORM_WINRT and WP8 2014-03-22 06:10:07 -07:00
base64.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
base64.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ccCArray.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
ccCArray.h issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
ccConfig.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 13:56:09 +08:00
ccFPSImages.c.REMOVED.git-id Uses Droid Sans Console font for FPS and more 2014-02-12 06:58:34 +08:00
ccFPSImages.h Uses Droid Sans Console font for FPS and more 2014-02-12 06:58:34 +08:00
ccGLStateCache.cpp issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
ccGLStateCache.h A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE. 2014-02-08 10:41:02 +08:00
ccMacros.h issue #4097: fix linking error of missing functions. 2014-02-20 17:01:13 +08:00
ccShaderEx_SwitchMask_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_Label_frag_df.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_df_glow.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_normal.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_frag_outline.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShader_Label_vert.h new label:add support for distanceField 2013-12-13 12:42:15 +08:00
ccShader_PositionColorLengthTexture_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionColorLengthTexture_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionColor_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionColor_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTextureA8Color_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTextureA8Color_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTextureColorAlphaTest_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTextureColor_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTextureColor_noMVP_frag.h Merge branch 'develop' into newRenderer 2013-12-05 22:24:41 -08:00
ccShader_PositionTextureColor_noMVP_vert.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
ccShader_PositionTextureColor_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTexture_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTexture_uColor_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTexture_uColor_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_PositionTexture_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_Position_uColor_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShader_Position_uColor_vert.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShaders.cpp Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccShaders.h Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
ccTypes.cpp Fix a mistake in Color4B(const Color3B& color). 2014-01-24 22:33:43 +08:00
ccTypes.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ccUTF8.cpp Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:10 +08:00
ccUTF8.h Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:59 +08:00
ccUtils.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ccUtils.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
cocos2d.cpp [ci skip] 2014-03-28 10:45:45 +08:00
cocos2d.h added CC_PLATFORM_WINRT and WP8 2014-03-22 06:09:48 -07:00
cocos2d.vcxproj revert vcxproj files 2014-03-24 10:50:48 +08:00
cocos2d.vcxproj.filters Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
cocos2d.vcxproj.user issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
cocos2d_headers.props build kazmath on win32 2014-03-05 14:30:55 +08:00
cocos2dx-Prefix.pch issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
cocos2dx.props Fixing compilation errors on windows. 2013-12-05 16:09:38 +08:00
firePngData.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
uthash.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
utlist.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00