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
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 		2011-01-20 11:18:35 +08:00
..
android fixed iphone/android/uphone compilation errors brought by the prevous commit of #322 2011-01-19 22:29:57 +08:00
iphone fixed iphone/android/uphone compilation errors brought by the prevous commit of #322 2011-01-19 22:29:57 +08:00
mac Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
uphone Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
win32 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
CCArchOptimalParticleSystem.h add platform support project on win32. 2011-01-15 18:05:35 +08:00
CCDirector_mobile.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +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 add platform support project on win32. 2011-01-15 18:05:35 +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
CCXApplication_platform.h add platform support project on win32. 2011-01-15 18:05:35 +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