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

35787 Commits

Author SHA1 Message Date
natural-law e8ac968b3b Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp. 2011-07-12 15:56:42 +08:00
RongHong 9328991cbd to update lua support 2011-07-12 15:18:14 +08:00
RongHong f7fd6fab3d Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-12 15:01:35 +08:00
RongHong 8f73678582 fixed #602 , TMX Orthogonal test has not picture 2011-07-12 15:01:14 +08:00
minggo 58f043a3fb Merge pull request #384 from natural-law/master 
fixed #603
 2011-07-11 23:42:05 -07:00
natural-law 8b5282a0cf fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more. 2011-07-12 14:21:29 +08:00
minggo d1cfe58f05 Merge pull request #383 from minggo/master 
change the version to 1.0.0
 2011-07-11 20:35:26 -07:00
minggo 86ec8d90b1 [iOS] change the version to 1.0.0 2011-07-12 11:31:38 +08:00
minggo f7df1be477 Merge pull request #381 from natural-law/master 
fixed #606
 2011-07-11 20:28:24 -07:00
natural-law 51b751aade Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-12 11:26:28 +08:00
minggo 933fa42a0a Merge pull request #382 from minggo/master 
upgrade to 1.0.0-final 07-11
 2011-07-11 20:25:17 -07:00
minggo d48c3fdfb1 upgrade to 1.0.0-final 07-11 2011-07-12 11:20:41 +08:00
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