axmol/cocos2dx/platform
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
..
android CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
bada CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
ios merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
linux merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
marmalade CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
qnx CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
third_party issue #1056: Reverted opengles emulator version to 2.09, because there are some issues in v2.10. 2012-03-27 14:11:28 +08:00
win32 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 2012-04-09 10:28:21 +08:00
wophone revert CCFileUtils::getFileData method. 2012-03-05 09:55:50 +08:00
CCAccelerometer_platform.h rename include file name from uppercase to lowercase for linux platform 2012-02-14 22:41:33 +08:00
CCApplication_platform.h Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h} 2012-03-12 14:22:39 +01:00
CCArchOptimalParticleSystem.h #issue 908: Merge marmalade to latest cocos2d-x source 2011-12-12 17:46:21 +08:00
CCCommon.cpp #issue 908: Merge marmalade to latest cocos2d-x source 2011-12-12 17:46:21 +08:00
CCCommon.h issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00
CCEGLView_platform.h rename include file name from uppercase to lowercase for linux platform 2012-02-14 22:41:33 +08:00
CCFileUtils.cpp CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
CCFileUtils.h merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
CCGL.cpp issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
CCGL.h issue #1056: Updated Android.mk, fixed a bug in CCImage.h. 2012-03-27 13:48:14 +08:00
CCImage.cpp rename include file name from uppercase to lowercase for linux platform 2012-02-14 22:41:33 +08:00
CCImage.h issue #1056: Updated Android.mk, fixed a bug in CCImage.h. 2012-03-27 13:48:14 +08:00
CCLibxml2.h move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
CCPlatformConfig.h issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
CCPlatformMacros.h issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
CCSAXParser.cpp issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCSAXParser.h issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
CCStdC.cpp fixed #1017: improve win32 timing accuracy 2012-03-06 14:12:57 +08:00
CCStdC.h #issue 908: Merge marmalade to latest cocos2d-x source 2011-12-12 17:46:21 +08:00
CCThread.cpp synchrolize to master 2011-11-18 18:53:53 +08:00
CCThread.h issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
platform.cpp #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00
platform.h #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00