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

35787 Commits

Author SHA1 Message Date
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +08:00
Walzer 56a1849e9f changelog for 0.8.3 2011-05-12 23:52:51 +08:00
Walzer 82b955ad6a update the version string in doxygen config 2011-05-12 22:32:16 +08:00
Walzer c7fb183dcb [airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now. 2011-05-12 21:58:11 +08:00
Walzer 4da5a0eb71 [android] move the TextField position to visable while soft keyboard popup 2011-05-12 21:32:57 +08:00
Walzer 1340bbf842 [android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method 2011-05-12 21:12:15 +08:00
Walzer f17a8f6226 Merge pull request #271 from minggo/iss488 
[Android] CCUserDefault works ok on android2.2
 2011-05-12 05:40:15 -07:00
minggo 91bc9a3f7a [android] fixed #488: fix memory leak 2011-05-12 18:55:32 +08:00
minggo 8e44d5bc40 [android] fixed #488: synchrolize code to HelloWorld 2011-05-12 18:34:16 +08:00
minggo d8f3b0c25b [android] CCUserDefault works ok on android2.2 2011-05-12 18:32:13 +08:00
minggo 5fad686f18 [iOS] change the version of template 2011-05-12 17:38:05 +08:00
Walzer bf04194877 Merge pull request #269 from yangws/master 
center CCTextField in TextInputTest
 2011-05-12 01:59:39 -07:00
Walzer 7874ec5305 Merge pull request #270 from yangws/vs2010 
compile ok in vs2010
 2011-05-12 01:59:24 -07:00
Walzer 6d07417c60 Merge pull request #268 from natural-law/master 
Fix the bug discovered by wophone test.
 2011-05-12 01:58:47 -07:00
yangws c73c1a9ab6 compile ok in vs2010 2011-05-12 16:15:10 +08:00
yangws 01c5048203 set TextInputTest CCTextField to center. 2011-05-12 14:45:44 +08:00
natural-law 2855a9cefb Fix the bug discovered by wophone test: 
1. Can't play music & effect on wophone device.
2. UserDefaultTest is in the wrong path in test.wophone.vcproj.
 2011-05-12 14:19:58 +08:00
minggo a50fe1b95b Merge pull request #267 from natural-law/master 
Modify the TextInputTest code to clean the memory leak.
 2011-05-11 20:01:23 -07:00
natural-law cc6367a835 Modify the TextInputTest code to clean the memory leak. 2011-05-12 10:54:33 +08:00
Walzer 7f0c35b158 Merge remote branch 'origin/master' 2011-05-12 10:52:33 +08:00
Walzer 10d94fb170 fixed #486, setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :) 2011-05-12 10:52:10 +08:00
minggo 52305461c5 Merge pull request #266 from natural-law/master 
Modify the test code for the right device orientation.
 2011-05-11 19:34:55 -07:00
natural-law a7db186d06 Modify the test code for the right device orientation. 2011-05-12 10:11:58 +08:00
Walzer 78d49e9806 [win32] dllexport 2 pure C functions from CCLabelBMFont.h 2011-05-12 08:40:19 +08:00
Walzer 249724f8d8 [ios] issue #371, fix the error when invoke CCImage::initWithString with null string "" 2011-05-12 08:24:29 +08:00
Walzer 58e9876124 change the position of TextField in TextInputTest 2011-05-11 22:15:51 +08:00
Walzer 074e127756 Merge pull request #265 from yangws/master 
fixed a bug: TextInputTestWithAction crash.
 2011-05-11 05:22:38 -07:00
yangws 7dad88c556 fixed a bug: TextInputTestWithAction crash. 2011-05-11 18:45:53 +08:00
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