Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/uphone
History
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
..
CCNS_uphone.cpp fixed some errors for iphone platform 2011-01-07 10:25:32 +08:00
CCTime.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCTime.h issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCXApplication_uphone.cpp [uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground(). 2011-01-20 13:55:45 +08:00
CCXApplication_uphone.h [uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground(). 2011-01-20 13:55:45 +08:00
CCXBitmapDC.cpp [uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6% 2010-12-31 16:07:52 +08:00
CCXBitmapDC.h [uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6% 2010-12-31 16:07:52 +08:00
CCXCocos2dDefine_uphone.h misc_node upto-0.99.5. 2010-12-25 15:09:42 +08:00
CCXCommon_uphone.cpp add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
CCXEGLView_uphone.cpp [uphone]fixed #308,BGM is paused when press power key to make uphone sleep. 2011-01-20 13:41:58 +08:00
CCXEGLView_uphone.h issue #304 Remove codes for controlling frame rate. 2011-01-10 15:13:30 +08:00
CCXFileUtils_uphone.cpp [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00
CCXFileUtils_uphone.h Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00
CCXUIAccelerometer_uphone.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCXUIAccelerometer_uphone.h issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
CCXUIImage_uphone.cpp Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
CCXUIImage_uphone.h misc_node upto-0.99.5. 2010-12-25 15:09:42 +08:00
Cocos2dTypes.h issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
NSLock.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
NSLock.h issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
NewDeleteOp.cpp issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
ccxCommon_uphone.h add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00