axmol/cocos/2d
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
Conflicts:
	cocos/scripting/auto-generated
2014-02-20 15:13:40 +08:00
..
platform Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 2014-02-20 15:13:40 +08:00
renderer issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Android.mk issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
CCAction.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCAction.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionCamera.cpp Camera and Node fixes 2014-01-13 12:52:07 -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 refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions 2014-02-18 14:22:14 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionGrid3D.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionGrid3D.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionInstant.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionInstant.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionInterval.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionInterval.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08: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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionTiledGrid.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCActionTiledGrid.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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 GlobalZOrder is used for render priority... 2014-01-18 11:38:06 -08:00
CCAtlasNode.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCClippingNode.cpp Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
CCClippingNode.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCComponent.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCComponent.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCComponentContainer.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCComponentContainer.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCConfiguration.cpp closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +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 issue #4058: typedef Ref Object; and deprecate it. 2014-02-20 10:58:37 +08:00
CCDirector.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDirector.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDrawNode.cpp Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
CCDrawNode.h Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode 2014-01-09 17:03:08 +08:00
CCDrawingPrimitives.cpp Adds a way to print the renderer vertices 2014-02-07 19:37:44 -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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventAcceleration.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners. 2014-02-10 11:15:56 +08:00
CCEventDispatcher.h issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListener.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCEventListenerAcceleration.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerAcceleration.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerCustom.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerCustom.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEventListenerTouch.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 Renames EGLView -> GLView 2014-01-30 15:40:56 -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 issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCFontAtlas.cpp closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture. 2014-02-18 14:30:51 +08:00
CCFontAtlas.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCFontAtlasCache.cpp Merge pull request #5156 from minggo/deprecate-function 2014-01-22 00:51:50 -08:00
CCFontAtlasCache.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes 2014-01-16 21:36:22 -08:00
CCFontCharMap.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +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 1.remove unused code 2014-01-22 14:57:11 +08:00
CCFontFNT.h 1.remove unused code 2014-01-22 14:57:11 +08:00
CCFontFreeType.cpp NewLabel memory leak fix. 2014-01-26 20:53:55 +08:00
CCFontFreeType.h 1.remove unused code 2014-01-22 14:57:11 +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 #4983 from dabingnn/develop_layerColorBug 2014-01-07 06:25:59 -08:00
CCGLProgram.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCIMEDispatcher.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCIMEDispatcher.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCLabel.cpp optimize label: 2014-02-19 20:26:14 +08:00
CCLabel.h optimize label: 2014-02-19 20:26:14 +08:00
CCLabelAtlas.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCLabelAtlas.h issue #3627, remove lua/js doxygen mark from LabelAtals constructor & destructor. 2014-01-09 14:21:43 +08:00
CCLabelBMFont.cpp fixes #3734 2014-01-16 14:23:52 -03:00
CCLabelBMFont.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCLabelTTF.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCLabelTTF.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCLabelTextFormatter.cpp fix warning 2014-02-20 10:24:35 +08:00
CCLabelTextFormatter.h 1.remove unused code 2014-01-22 14:57:11 +08:00
CCLayer.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCLayer.h Merge pull request #4983 from dabingnn/develop_layerColorBug 2014-01-07 06:25:59 -08:00
CCMenu.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCMenu.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCMenuItem.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCMenuItem.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCMotionStreak.cpp GlobalZOrder is used for render priority... 2014-01-18 11:38:06 -08:00
CCMotionStreak.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCNode.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCNode.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCNodeGrid.cpp Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
CCNodeGrid.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCParallaxNode.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCParticleBatchNode.cpp BatchCommand API fixes 2014-01-21 11:13:21 -08:00
CCParticleBatchNode.h SpriteBatchCommand and ParticleBatchCommand use the BatchCommand 2014-01-15 16:07:38 -08:00
CCParticleExamples.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCParticleExamples.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCParticleSystem.cpp closed #3597: Uses !xxx.empty() instead of xxx.size() > 0. 2014-01-08 10:47:27 +08:00
CCParticleSystem.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCParticleSystemQuad.cpp issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles. 2014-02-13 17:01:38 +08:00
CCParticleSystemQuad.h Adds 'ParticleSystemQuad::updateTexCoords' method. 2014-02-13 11:03:35 +08:00
CCProfiling.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCProfiling.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCProgressTimer.cpp Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
CCProgressTimer.h add override 2014-01-07 16:30:12 +08:00
CCProtocols.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCRenderTexture.cpp closed #3964, Use GL methods instead in function RenderTexture::newImage() 2014-02-18 10:47:14 +08:00
CCRenderTexture.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCScene.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCScene.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCScheduler.cpp issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now. 2014-02-20 14:11:47 +08:00
CCScheduler.h issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now. 2014-02-20 14:11:47 +08:00
CCScriptSupport.cpp issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
CCScriptSupport.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCShaderCache.cpp 3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest 2014-01-24 18:39:26 +08:00
CCShaderCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSprite.cpp re-add missing assert 2014-02-09 19:39:56 -08:00
CCSprite.h Sprite: removed _hasChildren 2014-01-15 18:37:07 -08:00
CCSpriteBatchNode.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSpriteBatchNode.h closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture. 2014-02-18 14:30:51 +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 more cleanup in TMX code 2014-02-07 18:33:30 -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 Added getPropertiesForGID that assings value instead of returning it. 2014-01-31 14:57:26 -08:00
CCTMXXMLParser.cpp more cleanup in TMX code 2014-02-07 18:33:30 -08:00
CCTMXXMLParser.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTextFieldTTF.cpp Renames EGLView -> GLView 2014-01-30 16:51:43 -08:00
CCTextFieldTTF.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTexture2D.cpp Uses `malloc` instead of `new[]`, keep malloc/free matching. 2014-02-18 11:14:02 +08:00
CCTexture2D.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTextureAtlas.cpp Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
CCTextureAtlas.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTextureCache.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTextureCache.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTransition.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCTransitionPageTurn.cpp GlobalZOrder is used for render priority... 2014-01-18 11:38:06 -08:00
CCTransitionPageTurn.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTransitionProgress.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTransitionProgress.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCTweenFunction.cpp refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions 2014-02-18 14:22:14 +08:00
CCTweenFunction.h refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions 2014-02-18 14:22:14 +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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08: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 #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
ccCArray.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
ccConfig.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 Adds GL::activeTexture() 2014-01-16 13:44:18 -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 #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
ccShaderEx_SwitchMask_frag.h
ccShader_Label_frag.h new label:add support for distanceField 2013-12-13 12:42:15 +08:00
ccShader_Label_frag_glow.h new label:add support for distanceField 2013-12-13 12:42:15 +08:00
ccShader_Label_frag_outline.h label : fix some error on android when the GLSL versions is 1.0 2013-12-16 14:36:11 +08:00
ccShader_Label_frag_shadow.h fixes warning on Label Fragment shader 2013-12-17 10:01:38 -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 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
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 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
ccShaders.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +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 update version 2014-01-23 16:25:38 +08:00
cocos2d.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
cocos2d.vcxproj issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
cocos2d.vcxproj.filters issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
cocos2d.vcxproj.user
cocos2d_headers.props Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes. 2014-01-23 10:27:42 +08:00
cocos2dx-Prefix.pch
cocos2dx.props Fixing compilation errors on windows. 2013-12-05 16:09:38 +08:00
firePngData.h
uthash.h
utlist.h