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

2653 Commits

Author SHA1 Message Date
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
natural-law cba538d5d0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 15:58:14 +08:00
natural-law 602c5f1894 fixed #595 2011-07-08 15:57:46 +08:00
RongHong de7150214c Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-08 15:40:27 +08:00
RongHong 7b74372cac fix #592 2011-07-08 15:38:32 +08:00
minggo 39a3b715cd fixed #589 2011-07-08 15:28:13 +08:00
natural-law 810cf3f8c3 fixed #591 2011-07-08 15:02:46 +08:00
minggo f0ea58651b fixed #586 2011-07-08 15:01:51 +08:00
Walzer 5c8b04bc25 fixed #585 2011-07-08 14:48:25 +08:00
natural-law 134a3a0fcf fixed #590 2011-07-08 14:32:09 +08:00
Walzer 08b26402d5 fixed #594, but find a new bug #597 2011-07-08 14:27:37 +08:00
natural-law db6a5fce23 fixed #588. 2011-07-08 14:16:10 +08:00
natural-law 5db1719302 fixed #587 2011-07-08 14:15:51 +08:00
minggo f9cfaa1a5d Merge pull request #366 from natural-law/master 
fixed #574
 2011-07-07 20:28:05 -07:00
natural-law 0cb3b0ce06 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 11:23:03 +08:00
natural-law ca4281904a fixed #574, Add bugs test case. 2011-07-08 11:22:35 +08:00
Walzer b91f046157 Merge pull request #365 from axmx/master 
[airplay] incorrect calculation of the bit depth
 2011-07-07 18:50:44 -07:00
Max Aksenov 90564fac49 [airplay] fix : incorrect calculation of the bit depth 2011-07-07 08:40:29 -07:00
minggo b0416adaf2 Merge pull request #364 from minggo/master 
upgrade to rc3
 2011-07-07 01:06:27 -07:00
minggo 96289b20c4 upgrade to rc3 2011-07-07 16:03:03 +08:00
minggo ae466898b0 Merge pull request #363 from minggo/master 
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
 2011-07-07 00:49:31 -07:00
minggo b08788d810 change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval* 2011-07-07 15:41:42 +08:00