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
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 		2013-12-31 14:58:11 +08:00
..
platform Updates nativeactivity.cpp. 2013-12-31 10:55:59 +08:00
renderer texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +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 More warning fixes. 2013-12-28 14:34:52 +08:00
CCActionCatmullRom.h Some warning fixes on linux. 2013-12-26 23:06:16 -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 Some warning fixes. 2013-12-25 16:06:39 +08:00
CCActionInterval.h Fix of wrong include symbol of CCVector.h 2013-12-30 11:55:01 +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 Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
CCAnimationCache.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCAtlasNode.cpp Merge pull request #4728 from dabingnn/develop_removeCommandPool 2013-12-29 21:53:12 -08:00
CCAtlasNode.h Merge pull request #4728 from dabingnn/develop_removeCommandPool 2013-12-29 21:53:12 -08:00
CCClippingNode.cpp change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCClippingNode.h change CustomCommand variable to class member. 2013-12-26 21:19:12 +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 closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCDirector.cpp closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCDirector.h Adds events in director 2013-12-21 00:56:28 -08:00
CCDrawNode.cpp closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCDrawNode.h closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCDrawingPrimitives.cpp More warning fixes. 2013-12-28 14:34:52 +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 Some warning fixes on linux. 2013-12-26 23:06: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 Some warning fixes on linux. 2013-12-26 23:06:16 -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 closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +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 Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead. 2013-12-25 11:00:51 +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 Some warning fixes on linux. 2013-12-26 23:06:16 -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 Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
CCLabelAtlas.h getDescription() works as expected 2013-12-12 14:30:22 -08:00
CCLabelBMFont.cpp Added test case for binary fnt file 2013-12-28 23:00:07 +04:00
CCLabelBMFont.h AngelCode binary file format support for LabelBMFont 2013-12-27 22:32:07 +04: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 fix align text error in label 2013-12-31 14:13:26 +08:00
CCLabelTextFormatter.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCLayer.cpp Merge pull request #4728 from dabingnn/develop_removeCommandPool 2013-12-29 21:53:12 -08:00
CCLayer.h change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCMenu.cpp Some warning fixes on linux. 2013-12-26 23:06:16 -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 CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCMotionStreak.h change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCNode.cpp closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch. 2013-12-30 11:10:02 +08:00
CCNode.h Merge pull request #4688 from walzer/develop 2013-12-27 04:04:48 -08:00
CCNodeGrid.cpp Merge pull request #4728 from dabingnn/develop_removeCommandPool 2013-12-29 21:53:12 -08:00
CCNodeGrid.h change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCNotificationCenter.cpp closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCNotificationCenter.h closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +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 change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
CCParticleBatchNode.h change QuadCommand variable to class member. 2013-12-26 16:36:03 +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 closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCParticleSystemQuad.h closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +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 change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCProgressTimer.h change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
CCProtocols.h issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
CCRenderTexture.cpp Merge branch 'develop' into develop_RenderTextureBug 2013-12-31 14:58:11 +08:00
CCRenderTexture.h closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCScene.cpp add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +08:00
CCScene.h add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +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 closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CCShaderCache.cpp fix black screen when back to foreground on android. 2013-12-27 11:56:56 +08:00
CCShaderCache.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCSprite.cpp Merge pull request #4728 from dabingnn/develop_removeCommandPool 2013-12-29 21:53:12 -08:00
CCSprite.h change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
CCSpriteBatchNode.cpp change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
CCSpriteBatchNode.h change QuadCommand variable to class member. 2013-12-26 16:36:03 +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 closed #2050: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 2013-12-23 15:40:33 +08:00
CCTMXLayer.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 2013-12-30 12:30:59 +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 closed #2050: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 2013-12-23 15:40:33 +08:00
CCTMXTiledMap.h Renames: IntValueMap —> ValueMapIntKey 2013-12-26 22:07:20 +08:00
CCTMXXMLParser.cpp closed #2050: move autorelease to CLN 2013-12-30 15:32:04 +08:00
CCTMXXMLParser.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 2013-12-30 12:30:59 +08:00
CCTextFieldTTF.cpp Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
CCTextFieldTTF.h change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
CCTextImage.cpp Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
CCTextImage.h Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
CCTexture2D.cpp Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead. 2013-12-25 11:00:51 +08:00
CCTexture2D.h More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
CCTextureAtlas.cpp texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +08:00
CCTextureAtlas.h texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +08:00
CCTextureCache.cpp Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
CCTextureCache.h fix android compile error 2013-12-25 13:57:17 +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 migration transition page turn to new renderer 2013-12-30 14:43:18 +08:00
CCTransitionPageTurn.h migration transition page turn to new renderer 2013-12-30 14:43:18 +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 #3517, enable CC_USE_PHYSICS by default 2013-12-27 00:00:50 +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 update cocos2d-x version string 2013-12-30 20:22:25 +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