Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,959 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2959 Commits

Author SHA1 Message Date
Walzer d0ff1f274e Merge pull request #264 from yangws/master 
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
 2011-05-11 03:28:16 -07:00
Walzer 60f1468f57 Merge pull request #263 from yangws/input_android 
fixed a bug: delete twice when delete button click once.
 2011-05-11 03:27:45 -07:00
Walzer dd79c54589 Merge pull request #261 from yangws/input2 
TextInputTest can work on wophone now.
 2011-05-11 03:27:10 -07:00
yangws b8a9db98dc fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button. 2011-05-11 18:22:55 +08:00
yangws e436e177de fixed a bug: delete twice when delete button click once. 2011-05-11 17:33:59 +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 #478 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
Walzer ec27d588a6 Merge pull request #260 from minggo/iss470 
[android] fixed #470: use GAME_ROOT instead of HELLOWORLD_ROOT
 2011-05-09 00:32:02 -07:00
minggo 687a49b66d [android] fixed #470: use GAME_ROOT instead of HELLOWORLD_ROOT 2011-05-09 15:21:08 +08:00
Walzer ab13d41d16 Merge pull request #259 from natural-law/master 
[wophone] Modify the wophone Makefile.ARM for the CCUserDefault.
 2011-05-08 20:16:13 -07:00
natural-law 8dc5c8d015 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-09 11:10:33 +08:00
natural-law 02f30a86b3 [wophone] Modify the wophone Makefile.ARM for the CCUserDefault. 2011-05-09 11:09:54 +08:00
Walzer 7c39b372ca Merge pull request #256 from natural-law/master 
fixed #487
 2011-05-08 19:27:48 -07:00
Walzer f5491f9a42 Merge pull request #257 from yangws/454 
fixed #454 Include Box2D.h use Box2D/Box2D.h in vs template.
 2011-05-08 19:24:01 -07:00
Walzer 61f828dcb9 Merge pull request #258 from minggo/iss447 
[iOS] fixed #477: force exit HelloWorld when x button is clicked
 2011-05-08 19:22:51 -07:00
minggo da64909963 [iOS] fixed #477: force exit HelloWorld when x button is clicked 2011-05-09 10:17:00 +08:00
yangws c415bc98d2 fixed #454 Include Box2D.h use Box2D/Box2D.h in vs template. 2011-05-09 10:13:24 +08:00
natural-law dd309fe862 [wophone] fixed #487, Implement the function CCFiltUtils::getWriteablePath() on wophone. 2011-05-09 10:03:43 +08:00
minggo e27452dd8a Merge pull request #253 from minggo/iss455 
Implement CCUserDefault
 2011-05-08 18:37:33 -07:00
Walzer 7fa669bad1 Merge pull request #255 from minggo/iss484 
fixed #484: solve a potential memory leak
 2011-05-08 02:21:31 -07:00
minggo 113f1ab2ef fixed #484: solve a potential issue 2011-05-06 18:09:31 +08:00
Walzer 3d17a650bf Merge pull request #254 from natural-law/master 
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
 2011-05-06 03:04:45 -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
minggo e14040730b fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +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
minggo bfcee3e2ae fixed #455: add CCUserDefault to HelloWorld 2011-05-06 17:09:35 +08:00
minggo 6c69107f33 fixed #455: CCUserDefault works ok on iOS 2011-05-06 17:01:41 +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 80f739942d issue #455 : compile CCUserDefault on iOS 2011-05-06 16:29:35 +08:00
minggo 33648a9e9b issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later 2011-05-06 16:14:07 +08:00
Walzer 857141eef3 [ios] issue #371, compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash 2011-05-06 15:43:36 +08:00
minggo 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
Walzer 9e41eb310c Merge pull request #252 from yangws/master 
chipmunk test ok.
 2011-05-05 22:42:41 -07:00
yangws b95ef2f242 chipmunk test ok. 2011-05-06 12:30:52 +08:00
Walzer 8e4cfec708 Merge pull request #251 from natural-law/iss482 
fixed #482
 2011-05-05 19:50:26 -07:00
natural-law 846b529e49 [wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK. 2011-05-06 10:13:12 +08:00
yangws 0fe61642f6 issue #478 text input ok. 2011-05-05 18:17:50 +08:00
Walzer dcdad9a81a Merge pull request #250 from yangws/481 
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
 2011-05-05 00:53:10 -07:00
Walzer c7e25d305a Merge pull request #248 from yangws/input 
Split TextInputTest to Default test and Action test. Compile ok on vs2010
 2011-05-05 00:50:48 -07:00
yangws 6eb24cafee fixed #481 remove KeyLock control code. 2011-05-05 14:00:36 +08:00
yangws 7c5a6d779c fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn. 2011-05-05 11:51:13 +08:00
minggo e7f484bfc9 Merge pull request #249 from Macarse/renderingExt 
Added the possibility of extending Cocos2dxGLSurfaceView and providing a
 2011-05-04 18:23:50 -07:00
Carlos Sessa 9d08f9582c Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method 2011-05-04 11:18:26 -03:00
yangws a5da2bd226 Split TextInputTest to Default test and Action test. Compile ok on vs2010. 2011-05-04 14:13:15 +08:00
Walzer cf18337926 Merge remote branch 'origin/master' 2011-05-03 14:48:40 +08:00
Walzer 5dc7ef2ffc sort the TestCases alphabetically in project.pbxproj 2011-05-03 14:48:25 +08:00
Walzer ccf712a3e3 Merge pull request #247 from yangws/459. 
fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT.
 2011-05-02 23:39:28 -07:00