Commit Graph

32 Commits

Author SHA1 Message Date
yangws 59f37ddb5d fixed Wrap glScissor in CCEGLVIew::setScissorInPoints. 2011-06-27 10:55:45 +08:00
liswei 0c5f28fc11 fixed call unzOpen, then may not call unzClose(WVGA) 2011-06-24 09:29:55 +08:00
liswei 4793713daa fixed call unzOpen, then may not call unzClose(WVGA) 2011-06-23 18:24:32 +08:00
natural-law cfee246959 fixed , Add an interface to get the current language. 2011-06-17 10:49:02 +08:00
yangws 7a6a891242 fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time. 2011-05-18 11:08:18 +08:00
yangws 8fa1b97149 fixed a bug by bin: when reopen the keyboard can't delete the text which inputed before. 2011-05-10 18:08:07 +08:00
yangws 21c8628e68 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2
Conflicts:
	cocos2dx/platform/wophone/CCApplication_wophone.h
	tests/tests/tests.h
2011-05-10 16:09:26 +08:00
yangws 167f4c206b issue KeyBoard can run on wophone. but too slow. 2011-05-10 15:48:26 +08:00
yangws fc01bada97 input from sencond twindow named input view.
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
2011-05-09 16:59:26 +08:00
natural-law dd309fe862 [wophone] fixed , Implement the function CCFiltUtils::getWriteablePath() on wophone. 2011-05-09 10:03:43 +08:00
minggo e27452dd8a Merge pull request from minggo/iss455
Implement CCUserDefault
2011-05-08 18:37:33 -07:00
natural-law 42b3ad676e [wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep. 2011-05-06 18:00:43 +08:00
yangws 3f8293dffb Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
	HelloWorld/wophone/HelloWorld.wophone.vcproj
	tests/test.wophone/copy_res.bat
2011-05-06 17:45:39 +08:00
yangws ced029257f temp commit 2011-05-06 16:38:09 +08:00
minggo 7e40957e04 Merge https://github.com/cocos2d/cocos2d-x into iss455 2011-05-06 16:29:44 +08:00
minggo 33648a9e9b issue : add compile CCUserDefault to WoPhone, but not test, because the path will change later 2011-05-06 16:14:07 +08:00
natural-law 846b529e49 [wophone] fixed , Modify the resource data path for the new WoPhone-SDK. 2011-05-06 10:13:12 +08:00
yangws 0fe61642f6 issue text input ok. 2011-05-05 18:17:50 +08:00
yangws 6eb24cafee fixed remove KeyLock control code. 2011-05-05 14:00:36 +08:00
yangws 7c5a6d779c fixed DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn. 2011-05-05 11:51:13 +08:00
natural-law e2ce006db2 fixed . [wophone] Refactor the CCFileUtils for the new packing approach. 2011-04-22 10:57:46 +08:00
yangws 7e81c56231 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
Conflicts:
	cocos2dx/platform/ios/CCFileUtils_ios.mm
2011-03-30 11:05:23 +08:00
yangws ba68a5b966 fixed test OK. 2011-03-29 17:32:52 +08:00
yangws 6c5cf577b7 issue wophone and android modified. 2011-03-29 15:05:53 +08:00
natural-law 1991a65b0b Merge branch 'master' into iss391
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
walzer 6cc09aa4dc Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396 2011-03-28 21:08:56 +08:00
yangws 6b66affbab fixed wophone modified. 2011-03-28 17:20:39 +08:00
yangws dceff2d179 issue android modified. 2011-03-28 11:09:49 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
natural-law 55143e3b9e issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
natural-law dd675f8cf1 [wophone]Resolve the memory leak of CCAccelerometer. 2011-03-11 17:41:19 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00