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

3011 Commits

Author SHA1 Message Date
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
minggo c00d59a568 fixed #838: android template support x86 2011-11-23 16:43:52 +08:00
minggo d938968c4c Merge pull request #578 from minggo/iss838_support_x86 
support x86
 2011-11-23 00:04:56 -08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
minggo d62d8aee55 Merge pull request #577 from minggo/pthread_optimize 
optimize CCTextureCache::addImageSync()
 2011-11-22 00:50:39 -08:00
minggo bc60ed7856 issue #854: optimize CCTextureCache::addImageAsync() 2011-11-22 16:47:24 +08:00
minggo efa9275d7f save the codes for testing 2011-11-21 12:04:21 +08:00
minggo 51eb56075b Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +08:00
minggo 4226fcf355 issue #854: add CCThread_ios.mm 2011-11-21 09:34:49 +08:00
minggo ba98c498a0 Merge pull request #575 from minggo/bada_merge 
merge bada branch
 2011-11-18 02:56:35 -08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
minggo 50a2e2d5e9 Merge pull request #574 from minggo/iss854_pthread 
remove unneeded files
 2011-11-17 18:59:03 -08:00
minggo f36a7e19f1 Merge branch 'iss854_pthread' of https://github.com/minggo/cocos2d-x into iss854_pthread 2011-11-18 10:57:44 +08:00
minggo 5d8043ce7e issue854: remove unneeded files 2011-11-18 10:54:36 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master 
fix memory-leak for lua engine
 2011-11-17 18:53:14 -08:00
minggo 775c7ff847 Merge pull request #573 from minggo/iss854_pthread 
support pthread
 2011-11-17 18:40:30 -08:00
minggo 0676714436 issue #854: add TextureCacheTest into makefile 2011-11-17 18:32:52 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo 81b8fc0ce8 fixed #854: fix a bug of CCTextureCache 2011-11-17 14:34:41 +08:00
minggo cb75465913 issue #854: add test case for CCTextureCache 2011-11-17 10:10:13 +08:00
minggo 2f0c5e5710 Merge pull request #572 from minggo/iss758_TTF_fonts 
fixed #758: fix the bug that TTF fonts cause low memory on android
 2011-11-15 19:44:03 -08:00
minggo dd8a2deeaf fixed #758: fix the bug that TTF fonts cause low memory on android 2011-11-16 11:40:24 +08:00
Phenix Yu dccf577ad3 getLastValidIterator() may return a invalid iterator m_array.end(). 
don't know where this code came from.
 2011-11-16 11:08:26 +08:00
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Phenix Yu 255293119d add tolua_usertype(tolua_S,"void*") to fix CCCallFuncND 2011-11-15 17:01:07 +08:00