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
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 		2013-12-25 10:41:37 +08:00
..
platform Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-25 10:41:37 +08:00
renderer remove class NewClippingNode 2013-12-24 14:10:54 +08:00
Android.mk Merge pull request #4625 from dabingnn/develop_NewClippingNode 2013-12-23 23:20:38 -08:00
CCAction.cpp issue #2790: StringUtils::toStringWithFormat —> StringUtils::format. 2013-12-12 09:37:56 +08:00
CCAction.h More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
CCActionCamera.cpp removes dirty from ActionCamera 2013-12-20 19:45:30 -08:00
CCActionCamera.h removes dirty from ActionCamera 2013-12-20 19:45:30 -08:00
CCActionCatmullRom.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionCatmullRom.h replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
CCActionEase.cpp fix some hungarial 2013-11-16 21:08:00 +08:00
CCActionEase.h adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons 2013-11-21 17:06:06 -08:00
CCActionGrid.cpp Merge branch 'develop' into develop_gridNode 2013-12-19 17:20:22 +08:00
CCActionGrid.h Merge branch 'develop' into develop_gridNode 2013-12-19 17:20:22 +08:00
CCActionGrid3D.cpp fix some hungarial 2013-11-16 21:08:00 +08:00
CCActionGrid3D.h Effects have protected contructors 2013-11-22 15:07:58 -08:00
CCActionInstant.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionInstant.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionInterval.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCActionInterval.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionManager.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCActionManager.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionPageTurn3D.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionPageTurn3D.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionProgressTimer.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionProgressTimer.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionTiledGrid.cpp Merge branch 'develop' into develop_gridNode 2013-12-19 17:20:22 +08:00
CCActionTiledGrid.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionTween.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCActionTween.h ControlSwitch compies 2013-11-15 12:04:47 -08:00
CCAnimation.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCAnimation.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCAnimationCache.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCAnimationCache.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCAtlasNode.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCAtlasNode.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
CCClippingNode.cpp fix clippingNode bug 2013-12-24 17:16:28 +08:00
CCClippingNode.h some rename for global variables and member functions. 2013-12-24 14:53:49 +08:00
CCComponent.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCComponent.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCComponentContainer.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCComponentContainer.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCConfiguration.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCConfiguration.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCDeprecated.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDeprecated.h issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
CCDirector.cpp Adds events in director 2013-12-21 00:56:28 -08:00
CCDirector.h Adds events in director 2013-12-21 00:56:28 -08:00
CCDrawNode.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-19 09:45:21 +08:00
CCDrawNode.h Removes unneeded files 2013-12-18 11:44:45 -08:00
CCDrawingPrimitives.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCDrawingPrimitives.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCEvent.cpp Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
CCEvent.h issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08:00
CCEventAcceleration.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventAcceleration.h Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
CCEventCustom.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventCustom.h issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventDispatcher.cpp Director emits events after visit, after draw and after update. And when the projection changes 2013-12-21 10:55:16 -08:00
CCEventDispatcher.h Director emits events after visit, after draw and after update. And when the projection changes 2013-12-21 10:55:16 -08:00
CCEventKeyboard.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventKeyboard.h issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventListener.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventListener.h closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerAcceleration.cpp closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerAcceleration.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
CCEventListenerCustom.cpp closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerCustom.h issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08:00
CCEventListenerKeyboard.cpp closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerKeyboard.h closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerMouse.cpp closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerMouse.h closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerTouch.cpp closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventListenerTouch.h closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
CCEventMouse.cpp Merge folder changes from develop 2013-10-30 23:19:36 -07:00
CCEventMouse.h Merge folder changes from develop 2013-10-30 23:19:36 -07:00
CCEventTouch.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventTouch.h issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventType.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCFont.cpp new label:add support for distanceField 2013-12-13 12:42:15 +08:00
CCFont.h new label:add support for distanceField 2013-12-13 12:42:15 +08:00
CCFontAtlas.cpp new label:add support for distanceField 2013-12-13 12:42:15 +08:00
CCFontAtlas.h new label:add support for distanceField 2013-12-13 12:42:15 +08:00
CCFontAtlasCache.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCFontAtlasCache.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCFontAtlasFactory.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCFontAtlasFactory.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCFontDefinition.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontDefinition.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontFNT.cpp fix some warnings 2013-12-06 16:32:06 +08:00
CCFontFNT.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontFreeType.cpp Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant. 2013-12-23 11:53:39 +08:00
CCFontFreeType.h Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant. 2013-12-23 11:53:39 +08:00
CCGLBufferedNode.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCGLBufferedNode.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCGLProgram.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCGLProgram.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 2013-12-17 15:50:24 +08:00
CCGrabber.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCGrabber.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCGrid.cpp Nore camera 2013-12-20 16:33:31 -08:00
CCGrid.h Removes CCCamera 2013-12-20 19:24:56 -08:00
CCIMEDelegate.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCIMEDispatcher.cpp change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCIMEDispatcher.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCLabel.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCLabel.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCLabelAtlas.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCLabelAtlas.h getDescription() works as expected 2013-12-12 14:30:22 -08:00
CCLabelBMFont.cpp Merge branch 'develop' into data-refactor 2013-12-24 16:24:17 +08:00
CCLabelBMFont.h remove class NewSpriteBatchNode 2013-12-24 11:03:59 +08:00
CCLabelTTF.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCLabelTTF.h remove Class NewSprite 2013-12-24 09:40:00 +08:00
CCLabelTextFormatProtocol.h Adds virtual destructors on Interfaces 2013-11-19 16:57:23 -08:00
CCLabelTextFormatter.cpp new label:add support for distanceField 2013-12-13 12:42:15 +08:00
CCLabelTextFormatter.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCLayer.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCLayer.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCMenu.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCMenu.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCMenuItem.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCMenuItem.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCMotionStreak.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCMotionStreak.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCNode.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCNode.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCNodeGrid.cpp Nore camera 2013-12-20 16:33:31 -08:00
CCNodeGrid.h NodeGrid fixes 2013-12-20 11:52:52 -08:00
CCNotificationCenter.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCNotificationCenter.h change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCParallaxNode.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCParallaxNode.h issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
CCParticleBatchNode.cpp Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
CCParticleBatchNode.h Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
CCParticleExamples.cpp change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
CCParticleExamples.h Menu + MenuItem 2013-11-15 13:14:12 -08:00
CCParticleSystem.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCParticleSystem.h issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
CCParticleSystemQuad.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:05:30 +08:00
CCParticleSystemQuad.h Merge branch 'develop' into newRenderer 2013-12-12 14:41:42 -08:00
CCProfiling.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCProfiling.h More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
CCProgressTimer.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCProgressTimer.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCProtocols.h issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
CCRenderTexture.cpp rename protected _beginWithClear to beginWithClear 2013-12-23 19:59:09 +08:00
CCRenderTexture.h rename protected _beginWithClear to beginWithClear 2013-12-23 19:59:09 +08:00
CCScene.cpp Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
CCScene.h Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
CCScheduler.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCScheduler.h issue #2790: Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler 2013-12-07 14:25:24 +08:00
CCScriptSupport.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCScriptSupport.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
CCShaderCache.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 2013-12-17 15:50:24 +08:00
CCShaderCache.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCSprite.cpp merge feature function from NewSprite into Sprite 2013-12-23 21:06:37 +08:00
CCSprite.h Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
CCSpriteBatchNode.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-24 16:07:25 +08:00
CCSpriteBatchNode.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCSpriteFrame.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCSpriteFrame.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCSpriteFrameCache.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCSpriteFrameCache.h issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
CCTMXLayer.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCTMXLayer.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTMXObjectGroup.cpp issue #2790: Fix for TMXObjectGroup::getObject. 2013-12-07 16:38:50 +08:00
CCTMXObjectGroup.h issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
CCTMXTiledMap.cpp replaces std::for_each with for() 2013-12-19 13:34:41 -08:00
CCTMXTiledMap.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTMXXMLParser.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTMXXMLParser.h issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
CCTextFieldTTF.cpp change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTextFieldTTF.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTextImage.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTextImage.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTexture2D.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTexture2D.h More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
CCTextureAtlas.cpp change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTextureAtlas.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTextureCache.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 2013-12-25 10:41:37 +08:00
CCTextureCache.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTileMapAtlas.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTileMapAtlas.h issue #2790: Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class . 2013-12-11 18:08:05 +08:00
CCTouch.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTouch.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTransition.cpp remove NewRenderTexture include file 2013-12-23 18:08:50 +08:00
CCTransition.h rename： 2013-12-16 14:21:05 +08:00
CCTransitionPageTurn.cpp change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter 2013-12-19 22:01:32 +08:00
CCTransitionPageTurn.h rename： 2013-12-16 14:21:05 +08:00
CCTransitionProgress.cpp remove NewRenderTexture include file 2013-12-23 18:08:50 +08:00
CCTransitionProgress.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCUserDefault.cpp [Data Refactor] compilation error fix. 2013-12-20 21:16:46 +08:00
CCUserDefault.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 2013-12-20 21:12:11 +08:00
CCUserDefault.mm [Data Refactor] compilation error fix. 2013-12-20 21:16:46 +08:00
CCUserDefaultAndroid.cpp Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
CCVertex.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCVertex.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CMakeLists.txt update project file:android and linux 2013-12-24 14:12:15 +08:00
TGAlib.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 2013-12-20 21:12:11 +08:00
TGAlib.h fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
TransformUtils.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
TransformUtils.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ZipUtils.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 2013-12-20 21:12:11 +08:00
ZipUtils.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
base64.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
base64.h replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
ccCArray.cpp fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
ccCArray.h fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
ccConfig.h issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
ccFPSImages.c issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
ccFPSImages.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
ccGLStateCache.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
ccGLStateCache.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccMacros.h ProgressTimer works OK 2013-12-06 17:42:16 -08:00
ccShaderEx_SwitchMask_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
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 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 Merge branch 'develop' into newRenderer 2013-12-05 22:24:41 -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 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 2013-12-17 15:50:24 +08:00
ccShaders.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 2013-12-17 15:50:24 +08:00
ccTypes.cpp change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
ccTypes.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
ccUTF8.cpp Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
ccUTF8.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
ccUtils.cpp replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
ccUtils.h replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
cocos2d.cpp updates cocos2d version 2013-11-22 16:58:05 -08:00
cocos2d.h remove include reference 2013-12-24 14:15:23 +08:00
cocos2d.vcxproj update vs project for remove some file into renderer. 2013-12-24 15:34:40 +08:00
cocos2d.vcxproj.filters update vs project for remove some file into renderer. 2013-12-24 15:34:40 +08:00
cocos2d.vcxproj.user issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
cocos2d_headers.props update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
cocos2dx-Prefix.pch issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
cocos2dx.mk issue #2905:samples build ok on linux 2013-10-22 18:01:56 +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