Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform
History
dumganhar 3c795073e0 Merge branch 'master' into bada 
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
 		2011-09-19 13:42:08 +08:00
..
airplay fixed #657 Latest git version was broken 2011-08-04 16:37:43 +08:00
android Merge pull request #498 from minggo/iss703 2011-08-31 18:30:22 -07:00
bada merge bada platform 2010-12-15 18:05:02 +08:00
ios Merge pull request #498 from minggo/iss703 2011-08-31 18:30:22 -07:00
third_party fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution. 2011-07-07 14:45:59 +08:00
win32 fixed #703: refactor Accelerometer 2011-08-31 17:14:29 +08:00
wophone fixed #703: refactor Accelerometer 2011-08-31 17:14:29 +08:00
CCAccelerometer_platform.h [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
CCApplication_platform.h [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
CCArchOptimalParticleSystem.h fixed #451,remove the code of support mac platform. 2011-04-11 11:24:10 +08:00
CCCommon.cpp [android] fixed #623: refactor Cocos2dJni.cpp 2011-07-25 14:12:30 +08:00
CCCommon.h fixed #676, add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet. 2011-08-31 14:20:33 +08:00
CCEGLView_platform.h [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
CCFileUtils.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-06-14 15:05:52 +08:00
CCFileUtils.h [android] fixed #688: support reading file other than apk 2011-08-25 11:24:31 +08:00
CCFileUtils_platform.h issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
CCGL.cpp fixed #451,remove the code of support mac platform. 2011-04-11 11:24:10 +08:00
CCGL.h fixed #451,remove the code of support mac platform. 2011-04-11 11:24:10 +08:00
CCImage.cpp issue #347: android can use ttf file 2011-07-28 17:20:37 +08:00
CCImage.h fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-27 16:55:04 +08:00
CCLibxml2.h move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
CCPlatformConfig.h fixed #651, add CCFileUtils to doxygen api document 2011-08-08 23:05:47 +08:00
CCPlatformMacros.h Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
CCSAXParser.cpp fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCSAXParser.h add copyright & author name for airplay port 2011-03-25 15:30:10 +08:00
CCStdC.cpp issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
CCStdC.h [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
CCThread.cpp [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
CCThread.h issue #396 android modified. 2011-03-28 11:09:49 +08:00
CCXApplication_platform.h Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
CCXCocos2dDefine_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCXEGLView_platform.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCXMath.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCXUIAccelerometer_platform.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
CCXUIImage_platform.h move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
ccxCommon_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
config_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
platform.cpp fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
platform.h issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00