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

22325 Commits

Author SHA1 Message Date
natural-law d3960a13df Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-12 10:36:30 +08:00
natural-law 3d24fc5be4 fixed #606, Resolve the wrong effect of the test case PageTransitionForward in TransitionsTest. 2011-07-12 10:36:07 +08:00
minggo bac8ddfacb Merge pull request #380 from minggo/master 
remove inline to comiple ok on android
 2011-07-11 01:45:54 -07:00
minggo eb675073ee remove inline to comiple ok on android 2011-07-11 16:36:19 +08:00
minggo 0a0024d482 Merge pull request #373 from flyingpacer/master 
commit some pkg files
 2011-07-11 00:45:19 -07:00
RongHong ae3dd1f497 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-11 15:33:53 +08:00
RongHong c8f5f703a5 to commit LuaCocos2d.cpp 2011-07-11 15:33:27 +08:00
minggo 76d15b8767 Merge pull request #379 from minggo/master 
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
 2011-07-11 00:30:54 -07:00
minggo c0efe58c2a Merge pull request #378 from natural-law/master 
Resolve a bug in ZipUtils.cpp
 2011-07-11 00:28:48 -07:00
minggo 60bf07b859 implements CCSequence::actionWithArray() & CCSpawn::actionWithArray() 2011-07-11 15:25:02 +08:00
natural-law 58733417e0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-11 15:17:24 +08:00
natural-law fcbe0443be Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone. 2011-07-11 15:16:29 +08:00
minggo 21b1af5f1c Merge pull request #377 from minggo/master 
[Android] break string & wrap word
 2011-07-11 00:09:43 -07:00
minggo fb436a6339 [Android] break string & wrap word 2011-07-11 15:02:41 +08:00
RongHong 41049ec0be Merge https://github.com/flyingpacer/cocos2d-x 2011-07-11 14:02:34 +08:00
RongHong 1d442f57f8 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-11 14:01:18 +08:00
RongHong 30166ad023 to commit the rest pkg files 2011-07-11 14:00:55 +08:00
Walzer 28bf48f665 issue #569 #601, fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5 2011-07-11 11:21:11 +08:00
Walzer aa12ea838e Merge remote branch 'origin/master' 2011-07-11 10:34:47 +08:00
Walzer 63ffc574d7 fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now. 2011-07-11 10:34:03 +08:00
minggo 697d675003 Merge pull request #375 from natural-law/master 
Add DirectorTest and BugsTest on wophone.
 2011-07-10 19:25:40 -07:00
natural-law 6b6436e4f7 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-11 10:17:29 +08:00
minggo 2337d9fefc Merge pull request #376 from minggo/master 
fix the usage of sort()
 2011-07-10 19:15:45 -07:00
minggo a64783d4d2 fix the usage of sort() 2011-07-11 10:12:29 +08:00
natural-law 7bc3983f04 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-11 10:12:07 +08:00
natural-law 36474b2131 Add DirectorTest and BugsTest on wophone. 2011-07-11 10:11:40 +08:00
RongHong 87f6e8736b Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-11 10:00:21 +08:00
Walzer 4e12ba3015 Merge pull request #374 from axmx/master 
[airplay] fix - it solves the problems related to incorrect memory allocation..
 2011-07-10 00:44:30 -07:00
Max Aksenov 7f07574630 [airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator.... 2011-07-09 13:05:22 -07:00
Max Aksenov fd04420c9b [airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator.... 2011-07-09 13:04:29 -07:00
unknown 54242d709e commit some pkg files 2011-07-08 22:32:54 +08:00
unknown 950c5ecd75 Merge https://github.com/cocos2d/cocos2d-x 2011-07-08 20:23:38 +08:00
minggo 2066cebd08 Merge pull request #371 from natural-law/master 
Add DirectorTest and BugsTest on android.
 2011-07-08 03:49:30 -07:00
minggo 839bd36da7 Merge pull request #372 from minggo/master 
upgrade xcode3 template
 2011-07-08 03:48:56 -07:00
RongHong 7b30969991 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-08 18:31:22 +08:00
RongHong 1a869e7c3a to commit some pkg files 2011-07-08 18:31:02 +08:00
minggo 487ba5c02d merge confict 2011-07-08 18:29:03 +08:00
minggo 87adeb6f92 upgrade xcode3 template 2011-07-08 18:24:58 +08:00
natural-law 1ffa7fbc19 Add DirectorTest and BugsTest on android. 2011-07-08 18:13:03 +08:00
Walzer e39fca389f Merge remote branch 'origin/master' 2011-07-08 18:01:52 +08:00
Walzer 944b03df5c issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu. 2011-07-08 18:01:28 +08:00
minggo fdf2834b63 Merge pull request #370 from liswei/issue583 
fixed #583 playBackgroundMusic("background-music-aac.wav", true) has no effect on win32
 2011-07-08 02:23:38 -07:00
minggo bc7c972e0e Merge pull request #367 from natural-law/master 
fixed #587 & fixed #588
 2011-07-08 02:22:47 -07:00
natural-law 1bdce00740 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/include/ccConfig.h
 2011-07-08 17:08:57 +08:00
minggo a1531cd478 Merge pull request #369 from flyingpacer/master 
fix #592
 2011-07-08 01:59:36 -07:00
liswei 82f2104e69 fixed #583 modify SimpleAudioEngine resource path ,in win32 2011-07-08 16:49:19 +08:00
minggo 6c37f42414 Merge pull request #368 from minggo/master 
fixed #586
 2011-07-08 01:46:54 -07:00
RongHong 64016e8a57 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-08 16:33:38 +08:00
minggo 4e5306a46b fixed #596 2011-07-08 16:27:13 +08:00
Walzer dead4cd717 fixed #593 CocosDenshion 2011-07-08 16:08:54 +08:00