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

3161 Commits

Author SHA1 Message Date
dumganhar 2b6d4e1b82 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-30 17:30:33 +08:00
dumganhar 262d5969c3 fixed #883: fix a bug in SpriteTest. 2011-11-30 17:29:16 +08:00
minggo a5f389894a Merge pull request #593 from minggo/box2d 
change version and support android 4.0
 2011-11-29 23:34:33 -08:00
minggo 5391d17421 Merge branch 'box2d' of https://github.com/minggo/cocos2d-x into box2d 2011-11-30 15:32:49 +08:00
minggo 4607ba8029 support for android 4.0 2011-11-30 15:30:11 +08:00
minggo abe66d2652 Merge pull request #592 from dumganhar/master_base 
fix a bug in CCScheduler.cpp
 2011-11-29 18:04:07 -08:00
dumganhar 445982a252 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-30 09:35:15 +08:00
dumganhar 68297f0121 fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param. 2011-11-30 09:32:07 +08:00
dumganhar 3f97e7db44 fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp 2011-11-30 09:26:45 +08:00
minggo efff0b767f Merge pull request #591 from minggo/box2d 
update Box2d for android iOS and linux
 2011-11-29 01:49:50 -08:00
minggo 7194c25b63 issue #850: update Makefile for Box2d 2011-11-29 17:43:11 +08:00
minggo 735726355c issue #850: add Makefile for Box2d 2011-11-29 17:22:03 +08:00
minggo adfec68577 fixed #850: update Box2d for linux 2011-11-29 17:12:21 +08:00
minggo c99d254c01 issue #850: update box2d for iOS and android 2011-11-29 15:16:16 +08:00
minggo 30f547fbe6 Merge pull request #590 from dumganhar/issue850_Box2d2.2.1 
Issue850 box2d2.2.1
 2011-11-28 22:19:39 -08:00
dumganhar 89f9bd6560 issue #850: upgrate box2d to 2.2.1 version, test on win32 and bada 2011-11-29 12:50:29 +08:00
dumganhar 5106f60131 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue850_Box2d2.2.1 2011-11-29 12:42:25 +08:00
dumganhar 0fff92236f add f project 2011-11-29 12:38:20 +08:00
minggo 266f0ee7ab Merge pull request #586 from leon-li/master 
Fix some minor bugs.
 2011-11-28 18:27:38 -08:00
Leon f108952595 Merge remote branch 'upstream/master' 
Conflicts:
	cocos2dx/support/CCPointExtension.cpp
 2011-11-29 10:15:15 +08:00
minggo d07f9a792d Merge pull request #589 from dumganhar/master_base 
fix some bugs on bada
 2011-11-28 17:52:24 -08:00
dumganhar 4bdd70ab90 fixed #781: Add functions for effects 2011-11-29 09:27:44 +08:00
dumganhar d108f4f456 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-28 23:13:02 +08:00
minggo 845f6d0051 Merge pull request #588 from minggo/iss879_CCAssert 
issue #879: replase assert with CCAssert
 2011-11-28 05:03:43 -08:00
dumganhar 2414117023 Merge branch 'master_base' of https://github.com/dumganhar/cocos2d-x into master_base 2011-11-28 19:37:59 +08:00
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
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