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

348 Commits

Author SHA1 Message Date
minggo dfbb0096e8 Merge pull request #283 from natural-law/master 
Compile tests OK on wophone.
 2011-05-24 18:45:18 -07:00
natural-law 8ab7057fe6 Resolve the memory leak of tests. 2011-05-24 18:00:59 +08:00
natural-law f89a93fcf8 Compile tests OK on wophone. 2011-05-24 17:52:24 +08:00
yangws c757dd4aeb fixed #503 new chipmunk code compiled ok on vs2010. 2011-05-24 16:18:47 +08:00
yangws d93a2f046e android can input number form soft keyboard. 2011-05-23 16:30:45 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
yangws 533949a736 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-23 10:11:13 +08:00
Walzer 6b24b6fb8d issue #503, i forget to add chipmunk_private.h into xcodeproj 2011-05-21 21:35:05 +08:00
Walzer e8835ee4c2 issue #503, add chipmunk new files into win32 vcproj 2011-05-21 17:10:29 +08:00
Walzer 335d02a556 issue #503, android version build & run ok. 2011-05-21 16:45:55 +08:00
Walzer a9027574eb issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok 2011-05-21 16:19:01 +08:00
yangws c9f66665ec temp commit. 2011-05-20 17:47:06 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
minggo ff1017d86f Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:18:37 -07:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
Walzer 2dd11490ad Merge pull request #274 from yangws/master 
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
 2011-05-18 18:51:38 -07:00
yangws 5173738f37 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-18 11:08:44 +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
minggo 6cf0a9d4f4 [android] fixed #494: fix a wrong function name 2011-05-18 10:54:52 +08:00
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +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 f17a8f6226 Merge pull request #271 from minggo/iss488 
[Android] CCUserDefault works ok on android2.2
 2011-05-12 05:40:15 -07:00
minggo d8f3b0c25b [android] CCUserDefault works ok on android2.2 2011-05-12 18:32:13 +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
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
natural-law a7db186d06 Modify the test code for the right device orientation. 2011-05-12 10:11:58 +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
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 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 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 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
minggo 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
yangws b95ef2f242 chipmunk test ok. 2011-05-06 12:30:52 +08:00