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

2456 Commits

Author SHA1 Message Date
minggo edb86b1154 issue #707: require works ok on iOS 2011-09-05 17:42:08 +08:00
minggo d6cc12ffe4 issue #707: require works ok on android 2011-09-05 17:13:52 +08:00
minggo 86536c3683 issue #707: add lua loader on android 2011-09-05 16:14:51 +08:00
minggo d86ce612c0 issue #707: add lua loader on android 2011-09-05 16:11:48 +08:00
minggo 018036eb28 Merge pull request #498 from minggo/iss703 
fixed #703: refactor Accelerometer
 2011-08-31 18:30:22 -07:00
minggo f61fde764b fixed #703: refactor Accelerometer 2011-08-31 17:14:29 +08:00
Walzer 6347f878c2 fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade 2011-08-31 16:35:40 +08:00
Walzer a68fb803a0 Merge pull request #497 from walzer/master 
add more languages to CCApplication::getCurrentLanguage() method
 2011-08-30 23:21:38 -07:00
Walzer 1402350870 fixed #676, add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet. 2011-08-31 14:20:33 +08:00
minggo ec7040f4b0 Merge pull request #496 from minggo/iss704 
fixed #704
 2011-08-30 20:56:49 -07:00
minggo d42336df56 remove functions of AccelerometerKeep & AccelerometerDestroy declation 2011-08-31 11:34:45 +08:00
Walzer cdd5911a36 Merge commit '8790401042a21da46aefa13a4461104673ba7d96' 2011-08-31 11:25:56 +08:00
minggo e92bce5590 print error message & pop error code 2011-08-31 11:25:49 +08:00
minggo 8790401042 Merge pull request #491 from Menki/master 
Feature #687 - add preloadBackgroundMusic and unloadBackgroundMusic to Android
 2011-08-30 19:01:41 -07:00
Augusto Souza 28b1f317f4 Revert "First version of unloadBackgroundMusic for android - Feature #687" 
This reverts commit a157b775f8.
 2011-08-30 09:30:12 -03:00
minggo 444a31b17b Merge pull request #495 from liswei/issue702 
fixed #702 tests crashs at the start on wophone device
 2011-08-30 01:51:08 -07:00
liswei dd90e8ce86 issue #702 add invalid point judgement 2011-08-30 16:40:57 +08:00
liswei c8619240c4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702 2011-08-30 16:39:13 +08:00
liswei ab2a6cb2bb fixed #702 tests crashs at the start on wophone device 2011-08-30 15:59:06 +08:00
Walzer 81c230e5de Merge pull request #494 from walzer/master 
fix a typo in CC_SWAP32 marco, change CCZHeader.version from unsigned char to unsigned short
 2011-08-30 00:33:48 -07:00
Walzer 554e3fda52 fixed #701, CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone 2011-08-30 15:26:17 +08:00
Walzer 9f1e26f8a0 fixed #700, a stupid typo in CC_SWAP32 marco 2011-08-30 15:20:41 +08:00
Walzer c050670e0c Merge branch 'master' of https://github.com/cocos2d/cocos2d-x (reverse-merged from commit e0a186fce09031664650892555c29f1e2e2201bb) 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x (reverse-merged from commit e0a186fce09031664650892555c29f1e2e2201bb)
 2011-08-30 14:50:02 +08:00
minggo ab470ad76d Merge pull request #493 from minggo/iss675 
issue 675
 2011-08-29 22:52:21 -07:00
minggo 0cfbf4344a fix a compiling error on wophone 2011-08-30 10:54:32 +08:00
minggo 414791a684 issue #675: initialize acceleration_ 2011-08-30 10:34:29 +08:00
minggo 92f741aa73 issue #675: remove unneeded header file 2011-08-30 09:49:55 +08:00
minggo fe50587841 issue #675: revert test code 2011-08-30 09:47:55 +08:00
minggo c7fd375539 issue #675: make wophone support only one accelerometer delegate 2011-08-30 09:45:11 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +08:00
minggo 762360650b Merge pull request #492 from minggo/iss698 
fixed #698:Not invoke init() in the construction of CCSprite
 2011-08-28 20:27:17 -07:00
minggo a411f4877c fixed #698:Not invoke init() in the construction of CCSprite 2011-08-29 11:00:31 +08:00
Augusto Souza a157b775f8 First version of unloadBackgroundMusic for android - Feature #687 2011-08-28 01:02:12 -03:00
Augusto Souza 32f8060c49 Prevent null point exception in preloadBackgroundMusic 2011-08-28 00:59:51 -03:00
Augusto Souza 3a0c2cb4fb First version of a preloadBackgroundMusic for Android - Feature #687 2011-08-27 23:24:52 -03:00
minggo 90e2ffc041 Merge pull request #490 from minggo/iss688 
[android] fixed #688: support reading file other than apk
 2011-08-24 21:48:33 -07:00
minggo e26eaae5e1 [android] fixed #688: support reading file other than apk 2011-08-25 11:24:31 +08:00
minggo 55dd2545d7 Merge pull request #488 from minggo/iss672 
fixed #672: implement copywithzone for CCShow & CCHide
 2011-08-24 01:51:30 -07:00
minggo dc17fdc342 Merge pull request #489 from minggo/master 
assign correct value to CCSkewY::m_fStartSkewY
 2011-08-24 01:51:12 -07:00
minggo ff34ada115 assign correct value to CCSkewY::m_fStartSkewY 2011-08-24 15:02:40 +08:00
minggo 952a01f43e fixed #672: implement copywithzone for CCShow & CCHide 2011-08-24 14:21:23 +08:00
minggo 8104377f3a Merge pull request #487 from minggo/master 
[android] copy files from Resources
 2011-08-23 02:22:15 -07:00
minggo 0879cd7466 [android] copy files from Resources 2011-08-23 17:17:09 +08:00
minggo 75339b7630 Merge pull request #486 from minggo/master 
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
 2011-08-23 02:10:22 -07:00
minggo a7e8c36eee invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n) 2011-08-23 17:04:38 +08:00
minggo 8010db7255 Merge pull request #485 from minggo/iss693 
[iOS] fixed #693: CCLabelTTF support line break with \n
 2011-08-23 01:33:36 -07:00
minggo 66b453edc9 [iOS] fixed #693: CCLabelTTF support line break with \n 2011-08-23 16:19:31 +08:00
minggo 3487b074ea Merge pull request #484 from minggo/master 
fixed #689: the width & height of CCRect should big or equal to 0
 2011-08-22 19:50:23 -07:00
minggo d5457526d4 fixed #689: the width & height of CCRect should big or equal to 0 2011-08-23 10:46:00 +08:00
minggo c91f9b15dd Merge pull request #483 from minggo/iss670 
[android] fixed #670
 2011-08-22 02:49:15 -07:00