Commit Graph

324 Commits

Author SHA1 Message Date
natural-law 7015e85918 fixed #328.By default,pop up a err dialog when loading textures failed. 2011-01-26 11:50:13 +08:00
natural-law 6a1b8d64aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-25 15:09:34 +08:00
natural-law d56575dd5a [uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath. 2011-01-25 14:26:26 +08:00
walzer 462ac4823f bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422 2011-01-25 11:33:03 +08:00
minggo e23c1eb2f6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-22 16:45:26 +08:00
minggo 4a4c0d3485 [android] fixed #321: Frame control of android. It is not so accuracy. 2011-01-22 15:10:18 +08:00
minggo 9d8f0f4b17 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-21 18:18:13 +08:00
minggo 882b473291 [iphone]: font support 2011-01-21 18:15:12 +08:00
minggo cb7a0e553a [iphone]: frame control 2011-01-21 17:33:15 +08:00
natural-law 6bde512cbe [android]issue #268,support more fonts on cocos2d-android. 2011-01-21 17:32:11 +08:00
natural-law 31fc6c0039 [uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground(). 2011-01-20 13:55:45 +08:00
natural-law f7107fb015 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
Conflicts:
	cocos2dx/platform/uphone/CCXApplication_uphone.h
2011-01-20 13:47:01 +08:00
natural-law 3d225465c0 [uphone]fixed #308,BGM is paused when press power key to make uphone sleep. 2011-01-20 13:41:58 +08:00
yangws ee50078b3e implement FPS limitation on UPhone. 2011-01-20 10:49:30 +08:00
walzer b7e109f6e6 fixed iphone/android/uphone compilation errors brought by the prevous commit of #322 2011-01-19 22:29:57 +08:00
walzer 9347fadc71 [win32] fixed #322, FPS control on win32 2011-01-19 18:23:42 +08:00
walzer e404a6aeb9 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2011-01-19 18:11:21 +08:00
yangws d627608ff4 win32 platform fps limitation support. 2011-01-19 17:59:20 +08:00
walzer 816deced9e Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5 2011-01-19 16:41:47 +08:00
walzer a0c50d3edb [iphone] support UTF8 Chinese chars 2011-01-19 16:26:55 +08:00
natural-law f992838f96 [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00
natural-law c682dd7084 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-18 10:16:35 +08:00
natural-law acb4a6a369 [uphone]fixed #293,modify the absolute path method in CCFileUtils. 2011-01-18 10:14:44 +08:00
walzer e399a77369 fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval. 2011-01-17 22:01:15 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
natural-law acff950860 [uphone]fixed #315,remove the way which use resource in ResourceMap. 2011-01-14 17:42:37 +08:00
minggo 6043008a11 Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track 2011-01-13 13:52:20 +08:00
natural-law 5fe891408c [win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again. 2011-01-13 10:14:32 +08:00
natural-law d1c6c466d3 fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32. 2011-01-12 15:48:36 +08:00
natural-law 00a9615e0f Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-10 18:08:57 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo d405d3a1ba fixed #310: 2011-01-10 16:03:53 +08:00
minggo 7e30615d02 issue #304 Remove codes for controlling frame rate. 2011-01-10 15:13:30 +08:00
Walzer 653cb2d76d [uphone] fixed #308, BGM can be paused after power key pressed to make uphone sleep. 2011-01-10 11:03:58 +08:00
minggo 78a7329054 Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5 2011-01-08 09:27:58 +08:00
natural-law c02a9a4dd5 Setting apk file path at runtime in cocos2d-android. 2011-01-07 16:29:06 +08:00
natural-law ec7fbd0e69 Fix bugs.
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
2011-01-07 11:30:19 +08:00
minggo 1f08213563 HelloWorld runs ok on iphone 2011-01-07 11:27:42 +08:00
minggo a391c8ef99 fixed some errors for iphone platform 2011-01-07 10:25:32 +08:00
minggo 99dd33f94a Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5 2011-01-07 09:33:09 +08:00
minggo 9a959c299f fixed some errors of iphone platform 2011-01-07 09:35:27 +08:00
natural-law e0570d43ad Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful. 2011-01-06 14:04:03 +08:00
natural-law 0d2d746aec Fix bugs.Run tests in cocos2d-uphone successful. 2011-01-05 17:01:08 +08:00
natural-law 1b37dd27ad Fix bugs.Run HelloWorld successful. 2011-01-05 11:24:52 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
Walzer 4a6989b6ff [uphone] add keyMenuBack to CCKeypadDelegate 2010-12-31 18:15:30 +08:00
natural-law 711f3a2906 modify YES to true,and No to false. 2010-12-31 17:56:46 +08:00
Walzer 56f8bf3c40 [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
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00