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

3824 Commits

Author SHA1 Message Date
dumganhar 9586f13386 issue #850: test box2d2.2.1 on bada 2011-11-28 19:03:10 +08:00
dumganhar 5a984bcc29 Merge branch 'master_base' into box2d2.2.1 2011-11-28 18:32:38 +08:00
dumganhar 3442d17dbe fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define. 2011-11-28 18:05:38 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
dumganhar 5a1891087d fixed #880: support playeffect repeatly on bada. 2011-11-28 16:09:01 +08:00
dumganhar 112ec42670 fixed #854: support bada pthread and semaphore 2011-11-28 16:07:17 +08:00
dumganhar 55d9beb92e issue #880: playEffect repeatly can't work on bada platform 2011-11-28 15:49:37 +08:00
dumganhar cad4ff05f3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2011-11-28 15:43:13 +08:00
dumganhar 31ea76c16a remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project 2011-11-28 14:33:29 +08:00
dumganhar 20455bf164 fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly. 2011-11-28 14:27:48 +08:00
YuLei Liao 153774b46d * merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg 2011-11-28 11:27:24 +08:00
minggo 77cf6f3cbc Merge pull request #587 from minggo/iss854_addImageSync 
issue #854: fix warning
 2011-11-27 18:15:35 -08:00
minggo 8fd6a7298f issue #854: fix warning 2011-11-28 10:12:31 +08:00
Leon 6f99f7efde 1. fix multi touch index. 
2. swap.
3. create gl view.
 2011-11-26 22:37:36 +08:00
Walzer ab7db20809 Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform 2011-11-26 17:20:12 +08:00
Walzer 8edbbd56a9 Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself. 2011-11-26 17:07:36 +08:00
dumganhar 10f5082a83 update box2d to version2.2.1 2011-11-25 18:30:27 +08:00
minggo c74502da94 Merge pull request #585 from minggo/iss854_addImageAsync 
Iss854 add image async
 2011-11-25 00:19:15 -08:00
minggo 842c64486e issue #854: remove unneeded code 2011-11-25 16:16:37 +08:00
minggo 77b830b36b issue #854: use semaphore instead of condition because the condition may lose message 2011-11-25 16:14:06 +08:00
minggo 8d2990ed79 Merge pull request #584 from minggo/iss781_cocosdenshion 
Add some audio functions
 2011-11-24 22:31:31 -08:00
minggo 59f2ce10f2 issue #781: implement audio functions on win32 2011-11-25 14:27:30 +08:00
minggo 89dbfee129 issue #781: add sound functions on linux 2011-11-24 22:16:24 -08:00
dumganhar 331dac34de Merge branch 'master' into master_base 
Conflicts:
	cocos2dx/include/CCDirector.h
 2011-11-25 11:06:20 +08:00
dumganhar d94effbcfa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-25 10:56:44 +08:00
minggo 7e61ce7d67 issue #781: add audio functions on linux 2011-11-25 10:48:05 +08:00
minggo 837e5048d2 Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion 2011-11-25 10:19:29 +08:00
minggo 2d68830241 Merge pull request #583 from minggo/iss760_set_NotificationNode 
Iss760 set notification node
 2011-11-24 18:18:17 -08:00
minggo c034f84b2d fixed #760: implement functions in .cpp 2011-11-25 10:17:32 +08:00
minggo 101f076a44 fixed #760: implement functions in .cpp 2011-11-25 10:13:59 +08:00
minggo f5bbad5833 issue #854: implement CCImage::initWithImageFileThreadSafe for iOS 2011-11-25 10:09:29 +08:00
dumganhar 79e204abad add semaphore support on bada 2011-11-25 10:06:26 +08:00
minggo e2169bb0fc Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion 2011-11-25 09:56:25 +08:00
minggo bd595516b8 issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
dumganhar c138d7e258 update CCAccelerometer on bada platform 2011-11-24 18:04:25 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +08:00
dumganhar aeb56495a6 add user truetype font support, fix a bug in CCTextureCache.cpp 2011-11-24 15:15:23 +08:00
dumganhar 07da67f253 Merge branch 'master' into master_base 
Conflicts:
	cocos2dx/menu_nodes/CCMenu.cpp
 2011-11-24 11:52:16 +08:00
dumganhar a25c149421 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x 2011-11-24 11:49:48 +08:00
dumganhar 1dbb503476 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-24 11:45:51 +08:00
dumganhar 4612e6e1d6 update pthread.cpp 2011-11-24 11:37:59 +08:00
dumganhar 42775d4ec5 update pthread implement 2011-11-24 10:58:09 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
dumganhar cfa42fa8a1 Merge branch 'newest' into master_base 2011-11-23 21:47:21 +08:00
dumganhar 035d7326db Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-23 21:43:40 +08:00
dumganhar 15e3a6b1cf update CCFileUtils_bada.cpp and CCImage_bada.cpp 2011-11-23 18:40:36 +08:00
dumganhar 8671255d0f Merge branch 'newest' of https://github.com/dumganhar/cocos2d-x into newest 2011-11-23 18:36:51 +08:00
minggo bbdbdbce9f Merge pull request #581 from minggo/iss760_set_NotificationNode 
fixed #760: add functions to get/add m_pNotificationNode
 2011-11-23 01:20:07 -08:00
minggo c3a034a19b fixed #760: add functions to get/add m_pNotificationNode 2011-11-23 17:18:53 +08:00
minggo c7aac6b526 Merge pull request #579 from minggo/iss838_support_x86 
android template supports x86
 2011-11-23 00:46:42 -08:00