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

22241 Commits

Author SHA1 Message Date
natural-law 2576bbe5b4 Merge branch 'master' into iss258 2010-12-14 13:53:25 +08:00
Walzer 02e95f6b06 issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet. 2010-12-14 11:21:44 +08:00
unknown acc30e35b1 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-14 11:10:46 +08:00
unknown 57770086e6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-14 11:09:36 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 341e7efb27 fixed #251 add a test case for CCKeypadDelegate 2010-12-14 10:23:20 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
unknown 7cc2498756 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-13 16:53:16 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 4e0d856151 fixed #256 2010-12-13 11:36:35 +08:00
minggo e620bbdfe9 fixed #257 2010-12-13 11:21:58 +08:00
Walzer 0766e7cf35 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-13 11:05:29 +08:00
Walzer 781ef1b2cb Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-13 10:54:02 +08:00
minggo faa3063ad0 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 17:41:33 +08:00
minggo 2f0f89abb1 fixed #255 2010-12-11 17:34:07 +08:00
minggo 3aae3196fa Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 14:18:47 +08:00
minggo 9b68538a2a fixed #250 2010-12-11 14:01:32 +08:00
minggo 1f34709c03 Merge branch 'master' of https://github.com/minggo/cocos2d-x 2010-12-11 13:40:16 +08:00
minggo 562930f816 fixed #252 2010-12-11 13:33:53 +08:00
minggo 817af55e1e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 13:26:26 +08:00
minggo b7e78d82ab fixed #254 2010-12-11 13:18:33 +08:00
natural-law 0ab7e88f9f fixed #249 implement read sound data from zip file in SimpleAudioEngine 2010-12-11 11:08:03 +08:00
yangws 3a81cf7208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-11 09:51:51 +08:00
yangws c4d0a45f3d add feature header file in CCXAppWiz HelloWorldScene.h 2010-12-11 09:50:46 +08:00
Walzer 9737e908ab Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-11 09:49:59 +08:00
yangws 851856d3da add feature header file in CCXAppWiz HelloWorldScene.h 2010-12-10 16:59:59 +08:00
Walzer dec419be71 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
Walzer 5babcbca6b fixed #248, crashed in CCSprite::setDisplayFrame 2010-12-10 10:31:14 +08:00
natural-law 6c1eb5d5c0 fixed #227 integrate multi-touch support on uphone 2010-12-09 18:28:16 +08:00
minggo f3126de646 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-09 13:59:02 +08:00
yangws 1151cea7dd fixed 233 keep the backlight on when the cocos2d-game at foreground. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-09 11:41:32 +08:00
minggo 6b37bc97d4 fixed #220: run tests on android 2010-12-09 10:50:02 +08:00
unknown 9c06a69ed9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-08 18:05:17 +08:00
unknown 4d22e3b263 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-08 18:03:35 +08:00
minggo a6855993f6 issue #220: android does not support glColor4ub, so use glColor4f instead 2010-12-06 11:15:16 +08:00
yangws 678d74ce8e fixed #235 PlayBackMusic use SimpleAudioEngine on win32 can repeat now. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-06 10:43:35 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
yangws 5b51bd049b issue #233 prevent KeyLock when playgame on uphone. 2010-12-04 18:16:09 +08:00
Walzer c02230b4ae fixed #240, CCSequence(..., CCHide::action(), ...) will not break down now. 2010-12-04 15:03:07 +08:00
natural-law 87ec4962cd Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge1204 2010-12-04 11:52:01 +08:00
natural-law 8891b894d6 fixed #239 Clear memory leak in cocos2d-uphone 2010-12-03 16:42:31 +08:00
yangws 96115bc26e fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. 
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.

Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-03 15:27:55 +08:00
minggo ad344d69fb fixed #238, checked in xcodeproj file for HelloWorld & tests 2010-12-03 14:39:07 +08:00
yangws 4df7cbcc40 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-03 11:24:39 +08:00
natural-law 3a0ae951b7 fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
yangws 687fb199fc issue #233 stop main loop when application enter background. test ok on emulator 2010-12-02 18:44:13 +08:00
yangws fc930f2877 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-02 14:31:33 +08:00
natural-law b3bb3ce461 Merge branch 'iss228' 2010-11-30 14:37:35 +08:00
natural-law 070439382e fixed #228 Optimize function SimpleAudioEngine::stopBackgroundMusic 2010-11-30 14:37:11 +08:00