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

1864 Commits

Author SHA1 Message Date
yangws c9f66665ec temp commit. 2011-05-20 17:47:06 +08:00
minggo 2bd72e1793 [android] fixed #501: remove unneedded 2011-05-20 17:43:29 +08:00
minggo 617703a681 [android] fixed #501: PACHAGE_PATH -> PACKAGE_PATH 2011-05-20 17:40:28 +08:00
minggo bcfbccc556 [android] fixed #501: let user input package path 2011-05-20 16:59:19 +08:00
yangws f285dd9709 fixed #489 For getting full path from relative path, GetCurrentDirectory instead GetModuleName in CCFileUtils_win32.cpp.(Need delete old Helloworld.win32.vcproj.XXX.YYY.user and test.win32.vcproj.XXX.YYY.user files for debug HelloWorld and tests on vs2008) 2011-05-20 10:26:46 +08:00
yangws 4c0008cd73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-20 10:02:16 +08:00
Walzer 81fcd3553f Merge pull request #277 from yangws/master 
Mofidy SoundPlayer.cpp for last TMediaPlayer for wophone. and fix #499
 2011-05-19 07:25:08 -07:00
unknown 97142d4a59 Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010 2011-05-19 21:11:29 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
yangws 1993fe5053 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-19 14:57:41 +08:00
yangws 6856ffc22c Modify SoundPlayer.cpp for the last TMediaPlayer.so 2011-05-19 14:57:16 +08:00
Walzer fc4681fe60 Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:21:24 -07:00
minggo 837f16555d Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:19:01 -07: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
Walzer 868c5ff0ac Merge pull request #275 from minggo/iss495 
[android] fixed #495: fix a memory leak
 2011-05-18 08:03:09 -07:00
yangws e6c7d9fe63 fixed bug: The background music not stoped when app enter background some time. 2011-05-18 14:34:22 +08:00
minggo 56e68e6941 Merge pull request #273 from minggo/iss494 
[android] fixed #494: fix a wrong function name
 2011-05-17 22:59:18 -07:00
minggo 822016e375 [android] fixed #495: fix a memory leak 2011-05-18 13:56:35 +08:00
yangws 8e07ab7dc9 Modify CCLog out utf-8 string on win32 and wophone emulator. 2011-05-18 11:25:54 +08: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
Walzer f44e8a76d0 Merge pull request #272 from natural-law/master 
[win32] fixed #492
 2011-05-16 23:34:32 -07:00
natural-law 95a46bd5f8 [ios] fixed #493, The return value of CCFileUtils::getWriteablePath() should be end with '/'. 2011-05-17 10:44:56 +08:00
natural-law 0466166935 [win32] fixed #492, Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile(). 2011-05-16 17:13:15 +08:00
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