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
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 		2013-11-12 15:30:36 +08:00
..
platform Merge pull request #4156 from bopohaa/patch-1 2013-11-11 18:31:03 -08:00
Android.mk Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
CCAction.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCAction.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionCamera.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionCamera.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionCatmullRom.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionCatmullRom.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionEase.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionEase.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionGrid.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionGrid.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionGrid3D.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionGrid3D.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionInstant.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionInstant.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionInterval.cpp fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCActionInterval.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionManager.cpp fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCActionManager.h fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCActionPageTurn3D.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionPageTurn3D.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionProgressTimer.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionProgressTimer.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionTiledGrid.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCActionTiledGrid.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionTween.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCActionTween.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCAnimation.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCAnimation.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCAnimationCache.cpp Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCAnimationCache.h Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCAtlasNode.cpp fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCAtlasNode.h fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCCamera.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCCamera.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCClippingNode.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCClippingNode.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCComponent.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCComponent.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCComponentContainer.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCComponentContainer.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCConfiguration.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCConfiguration.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCDeprecated.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDeprecated.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCDirector.cpp issue #3025: directly use _textureCache in Director 2013-11-11 14:21:41 +08:00
CCDirector.h issue #3025: add getTextureCache() in CCdirector() 2013-11-07 18:52:36 +08:00
CCDrawNode.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCDrawNode.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCDrawingPrimitives.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +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 Merge folder changes from develop 2013-10-30 23:19:36 -07: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 closed #3106: fixed: EventListeners can't be removed sometimes. 2013-11-02 22:08:08 +08:00
CCEventDispatcher.h issue #3069: Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'. 2013-10-29 14:57: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 Merge folder changes from develop 2013-10-30 23:19:36 -07:00
CCEventListenerAcceleration.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventListenerAcceleration.h issue #3069: Remove unused ID. 2013-10-29 15:01:39 +08:00
CCEventListenerCustom.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventListenerCustom.h issue #3069: Updating comments in CCEventListenerCustom.h. 2013-10-29 15:02:26 +08:00
CCEventListenerKeyboard.cpp issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
CCEventListenerKeyboard.h issue #3069: Remove unused ID. 2013-10-29 15:01:39 +08:00
CCEventListenerMouse.cpp Merge folder changes from develop 2013-10-30 23:19:36 -07:00
CCEventListenerMouse.h Merge folder changes from develop 2013-10-30 23:19:36 -07:00
CCEventListenerTouch.cpp Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable. 2013-11-09 18:11:57 +08:00
CCEventListenerTouch.h issue #3069: Remove unused ID. 2013-10-29 15:01:39 +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 continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFont.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlas.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlas.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlasCache.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlasCache.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlasFactory.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontAtlasFactory.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +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 issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCFontFNT.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCFontFreeType.cpp Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCFontFreeType.h issus #2893:improve new label 2013-10-31 17:52:22 +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 Adds flags in GLProgram to prevent sending uneeded uniforms 2013-10-31 17:56:15 -07:00
CCGLProgram.h Adds flags in GLProgram to prevent sending uneeded uniforms 2013-10-31 17:56:15 -07: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 continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCGrid.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCIMEDelegate.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCIMEDispatcher.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCIMEDispatcher.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCLabel.cpp Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCLabel.h Adds more strings 2013-11-07 12:42:16 -08:00
CCLabelAtlas.cpp Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
CCLabelAtlas.h Adds more strings 2013-11-07 12:42:16 -08:00
CCLabelBMFont.cpp Merge pull request #4160 from dabingnn/iss3025_TextureCache 2013-11-10 23:08:01 -08:00
CCLabelBMFont.h Adds more strings 2013-11-07 12:42:16 -08:00
CCLabelTTF.cpp Adds more strings 2013-11-07 12:42:16 -08:00
CCLabelTTF.h Adds more strings 2013-11-07 12:42:16 -08:00
CCLabelTextFormatProtocol.h issue #2893:improve new label 2013-10-31 20:17:30 +08:00
CCLabelTextFormatter.cpp issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
CCLabelTextFormatter.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCLayer.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
CCLayer.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
CCMenu.cpp closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter. 2013-11-01 20:53:51 +08:00
CCMenu.h Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
CCMenuItem.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCMenuItem.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCMotionStreak.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCMotionStreak.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCNode.cpp Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCNode.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCNotificationCenter.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCNotificationCenter.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCParallaxNode.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCParallaxNode.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCParticleBatchNode.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCParticleBatchNode.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCParticleExamples.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCParticleExamples.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCParticleSystem.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCParticleSystem.h Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCParticleSystemQuad.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCParticleSystemQuad.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCProfiling.cpp issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
CCProfiling.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCProgressTimer.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCProgressTimer.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCProtocols.h Adds more strings 2013-11-07 12:42:16 -08:00
CCRenderTexture.cpp issue #3025: move VolatileTexture static function to VolatileTextureMgr 2013-11-08 16:47:33 +08:00
CCRenderTexture.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCScene.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
CCScene.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCScheduler.cpp HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp. 2013-11-11 14:36:43 +08:00
CCScheduler.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCScriptSupport.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCScriptSupport.h issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
CCShaderCache.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCShaderCache.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCSprite.cpp Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
CCSprite.h Fix typos and other trivial cleanup 2013-11-10 22:00:50 -05:00
CCSpriteBatchNode.cpp Merge pull request #4160 from dabingnn/iss3025_TextureCache 2013-11-10 23:08:01 -08:00
CCSpriteBatchNode.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCSpriteFrame.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCSpriteFrame.h Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCSpriteFrameCache.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCSpriteFrameCache.h Uses `const std::string&` 2013-11-05 19:02:03 -08:00
CCTMXLayer.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
CCTMXLayer.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTMXObjectGroup.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTMXObjectGroup.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTMXTiledMap.cpp #include <algorithm> for std::max, std::min on VS2013. 2013-11-12 10:35:50 +08:00
CCTMXTiledMap.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCTMXXMLParser.cpp continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCTMXXMLParser.h continue replacing `const char*` with `const std::string&` 2013-11-06 17:05:13 -08:00
CCTextFieldTTF.cpp Adds more strings 2013-11-07 12:42:16 -08:00
CCTextFieldTTF.h Adds more strings 2013-11-07 12:42:16 -08:00
CCTextImage.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTextImage.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTexture2D.cpp issue #3025: move VolatileTexture static function to VolatileTextureMgr 2013-11-08 16:47:33 +08:00
CCTexture2D.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCTextureAtlas.cpp fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCTextureAtlas.h fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
CCTextureCache.cpp Merge pull request #4171 from dumganhar/jsb-64bit-fix 2013-11-11 02:17:42 -08:00
CCTextureCache.h issue #3025: move deprecated texture cache implementation to cpp file 2013-11-11 15:40:12 +08:00
CCTileMapAtlas.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTileMapAtlas.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +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 EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
CCTransition.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTransitionPageTurn.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTransitionPageTurn.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCTransitionProgress.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCTransitionProgress.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
CCUserDefault.cpp Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCUserDefault.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCUserDefault.mm Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCUserDefaultAndroid.cpp fix compiling erros on Android 2013-11-07 17:16:31 +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 issue #3113: 32Bit fix and 13.10 32bit complication is ok. 2013-11-06 14:54:35 +08:00
TGAlib.cpp Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
TGAlib.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +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 Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
ZipUtils.h Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
base64.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
base64.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccCArray.cpp Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
ccCArray.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
ccConfig.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +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 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccGLStateCache.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccMacros.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShaderEx_SwitchMask_frag.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +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_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 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccShaders.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccTypes.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccTypes.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccUTF8.cpp issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
ccUTF8.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ccUtils.cpp issue #2905:add ccUtils.cpp 2013-10-14 14:56:57 +08:00
ccUtils.h issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
cocos2d.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
cocos2d.h Merge folder changes from develop 2013-10-30 23:19:36 -07:00
cocos2d.vcxproj Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
cocos2d.vcxproj.filters Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
cocos2d.vcxproj.user issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
cocos2d_headers.props adjust std:function support 10 parameter 2013-10-23 16:48:51 +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 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +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