axmol/cocos/2d
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
2014-04-24 16:58:46 +08:00
..
platform Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
renderer Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
Android.mk android OK 2014-04-21 17:38:10 +08:00
CCAction.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCAction.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionCamera.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionCamera.h remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +08:00
CCActionCatmullRom.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionCatmullRom.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionEase.cpp fix ease elastic action error 2014-03-08 21:51:17 +08:00
CCActionEase.h Issue #3897: Add missed constructors 2014-03-28 17:45:06 +08:00
CCActionGrid.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionGrid.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionGrid3D.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionGrid3D.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionInstant.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionInstant.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionInterval.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-23 14:46:14 +08:00
CCActionInterval.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionManager.cpp issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
CCActionManager.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionPageTurn3D.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionTiledGrid.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCActionTween.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionTween.h Issue #3897: Add missed constructors 2014-03-28 17:45:06 +08:00
CCAnimation.cpp Fixed #4638: Add loop parameter to Animation::createWithSpriteFrames 2014-04-02 18:06:17 +08:00
CCAnimation.h issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
CCAnimationCache.cpp issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
CCAnimationCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCAtlasNode.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCAtlasNode.h draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCClippingNode.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCClippingNode.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +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 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
CCConfiguration.h issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
CCDirector.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-23 14:46:14 +08:00
CCDirector.h remove kazmath include file 2014-04-16 14:08:58 +08:00
CCDrawNode.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDrawNode.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCDrawingPrimitives.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDrawingPrimitives.h replace Point with Vector2 2014-04-15 18:08:29 +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 Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 2014-04-15 12:50:33 +08:00
CCEventDispatcher.h closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently 2014-04-08 15:08:34 +08: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 closed #4557: Adds `EventListener::setEnabled/isEnabled`. 2014-04-03 15:32:16 +08:00
CCEventListener.h Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 2014-04-15 12:50:33 +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 add comment for EventListenerTouchOneByOne::checkAvailable() 2014-04-17 14:46:52 +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 Some fixes detected by xcode analyze 2014-04-09 20:41:09 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCFontAtlasCache.h replace Point with Vector2 2014-04-15 18:08:29 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCFontFNT.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCFontFreeType.cpp Some fixes detected by xcode analyze 2014-04-09 20:41:09 +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 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCGLProgram.h remove kazmath/kazmath.h include 2014-04-15 23:50:28 +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 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCGrid.h remove kazmath include file 2014-04-16 14:08:58 +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 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-23 14:46:14 +08:00
CCLabel.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-15 22:21:04 +08:00
CCLabelAtlas.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
CCLabelAtlas.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
CCLabelBMFont.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
CCLabelBMFont.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
CCLabelTTF.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCLabelTTF.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
CCLabelTextFormatter.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCLabelTextFormatter.h 1.remove unused code 2014-01-22 14:57:11 +08:00
CCLayer.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCLayer.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCMenu.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCMenu.h fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
CCMenuItem.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCMenuItem.h issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
CCMotionStreak.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCMotionStreak.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCNode.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCNode.h remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCNodeGrid.cpp remove warning message---finished 2014-04-16 11:20:45 +08:00
CCNodeGrid.h remove kazmath include file 2014-04-16 14:08:58 +08:00
CCParallaxNode.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCParallaxNode.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCParticleBatchNode.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCParticleBatchNode.h draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCParticleExamples.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCParticleSystem.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCParticleSystemQuad.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCParticleSystemQuad.h replace Point with Vector2 2014-04-15 18:08: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 remove kazmath include file 2014-04-16 14:08:58 +08:00
CCProgressTimer.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCProtocols.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCRenderTexture.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
CCRenderTexture.h remove kazmath include file 2014-04-16 14:08:58 +08:00
CCScene.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCScene.h Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
CCScheduler.cpp issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +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 issue #4729: Android build works ok. 2014-04-10 00:36:42 +08: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 kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCSprite.h remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCSpriteBatchNode.cpp remove kazmath include file 2014-04-16 14:08:58 +08:00
CCSpriteBatchNode.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-11 11:18:13 +08:00
CCSpriteFrame.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCSpriteFrame.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCSpriteFrameCache.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCSpriteFrameCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTMXLayer.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTMXLayer.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTMXObjectGroup.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTMXObjectGroup.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTMXTiledMap.cpp issue #4729: Android build works ok. 2014-04-10 00:36:42 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTMXXMLParser.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTextFieldTTF.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-11 11:18:13 +08:00
CCTextFieldTTF.h remove kmMat4 interface in class RenderTexture and TextureFieldTTF file 2014-04-09 11:41:20 +08:00
CCTexture2D.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTexture2D.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTextureAtlas.cpp issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
CCTextureAtlas.h closed #3684, Set shader program before TextureAtlas is rendered. 2014-02-28 11:43:41 +08:00
CCTextureCache.cpp Const love: std::function<void(Texture2D*)> -> const 2014-04-14 10:01:17 +08:00
CCTextureCache.h Const love: std::function<void(Texture2D*)> -> const 2014-04-14 10:01:17 +08:00
CCTileMapAtlas.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTileMapAtlas.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTouch.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTouch.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCTransition.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTransition.h draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCTransitionPageTurn.cpp draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCTransitionPageTurn.h draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCTransitionProgress.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08: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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCVertex.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CMakeLists.txt issue #4729: Android build works ok. 2014-04-10 00:36:42 +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 #4729: include "ccTypes.h" in ccCArray.cpp for CC_INVALID_INDEX 2014-04-10 00:36:43 +08:00
ccCArray.h issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h, 2014-04-10 00:36:42 +08:00
ccConfig.h replace Point with Vector2 2014-04-15 18:08:29 +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 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +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 replace Point with Vector2 2014-04-15 18:08:29 +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
ccShader_PositionColorLengthTexture_vert.h
ccShader_PositionColor_frag.h
ccShader_PositionColor_vert.h
ccShader_PositionTextureA8Color_frag.h
ccShader_PositionTextureA8Color_vert.h
ccShader_PositionTextureColorAlphaTest_frag.h
ccShader_PositionTextureColor_frag.h
ccShader_PositionTextureColor_noMVP_frag.h
ccShader_PositionTextureColor_noMVP_vert.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
ccShader_PositionTextureColor_vert.h
ccShader_PositionTexture_frag.h
ccShader_PositionTexture_uColor_frag.h
ccShader_PositionTexture_uColor_vert.h
ccShader_PositionTexture_vert.h
ccShader_Position_uColor_frag.h
ccShader_Position_uColor_vert.h
ccShaders.cpp closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
ccShaders.h closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
ccTypes.cpp issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h, 2014-04-10 00:36:42 +08:00
ccTypes.h replace Point with Vector2 2014-04-15 18:08:29 +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 update version 2014-04-21 13:43:42 +08:00
cocos2d.h remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
cocos2d.vcxproj issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
cocos2d.vcxproj.filters issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
cocos2d.vcxproj.user
cocos2d_headers.props [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
cocos2d_winrt.props added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt.vcxproj added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt.vcxproj.filters added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
cocos2d_winrt_headers.props [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
cocos2d_wp8.vcxproj fix compiler error in wp8 2014-04-10 15:15:17 +08:00
cocos2d_wp8.vcxproj.filters fix compiler error in wp8 2014-04-10 15:15:17 +08:00
cocos2d_wp8_headers.props [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
cocos2dx-Prefix.pch
cocos2dx.props
firePngData.h
uthash.h
utlist.h