axmol/cocos2dx/platform
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
..
android Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-22 16:45:26 +08:00
iphone [iphone]: font support 2011-01-21 18:15:12 +08:00
mac [android]issue #268,support more fonts on cocos2d-android. 2011-01-21 17:32:11 +08:00
uphone Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-22 17:52:06 +08:00
win32 Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
CCArchOptimalParticleSystem.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCDirector_mobile.cpp Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
CCFileUtils_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCGL.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCGrid_mobile.cpp fix some error in CCGrid and CCDirector.h 2010-12-30 10:28:13 +08:00
CCLayer_mobile.cpp Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
CCMenu_mobile.cpp Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
CCNS.h fixed some errors for iphone platform 2011-01-07 10:25:32 +08:00
CCNode_mobile.cpp Fix bugs.Run HelloWorld successful. 2011-01-05 11:24:52 +08:00
CCParticleSystemPoint_mobile.cpp fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
CCParticleSystemPoint_mobile.h fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
CCParticleSystemPoint_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCPlatformMacros.h Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-19 15:29:08 +08:00
CCTransition_mobile.cpp update layers_scenes_transition_nodes to 0.99.5. 2010-12-27 09:40:45 +08:00
CCXEGLView_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCXUIAccelerometer_platform.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
platform.cpp add platform support project on win32. 2011-01-15 18:05:35 +08:00
platform.h move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00