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

8280 Commits

Author SHA1 Message Date
Michael Chinen bc11fdd8f5 Merge branch 'mchinensedit' 2013-05-01 00:52:59 +09:00
Michael Chinen be2f20e213 Fix missing protocol method warning for iOS 6.0 addition 2013-05-01 00:35:17 +09:00
minggo 60e4730122 Update AUTHORS 2013-04-29 23:26:18 +08:00
minggo bb632f874b Merge pull request #2455 from FlowerpotGames/CCScrollView-TouchPriorityFix 
CCScrollView TouchPriority Fix
 2013-04-29 08:25:10 -07:00
minggo d1506326ba Merge pull request #2484 from sergey-shambir/bit_more_verbose 
Logging: More verbose output in removeChildByTag and getActionByTag
 2013-04-29 08:06:53 -07:00
minggo 159e33f202 Update AUTHORS 2013-04-29 23:03:31 +08:00
minggo 489e684a0e Merge pull request #2443 from rodrigogolive/spine-fix 
Fixing broke linux build
 2013-04-29 08:01:39 -07:00
minggo deecee45bc Merge pull request #2491 from minggo/master 
fix some typos
 2013-04-28 08:27:27 -07:00
minggo 0bc13fc088 fix some typos 2013-04-28 23:22:51 +08:00
minggo d43f0d7622 Merge pull request #2489 from minggo/master 
update version and changelog
 2013-04-28 01:06:41 -07:00
minggo 2cadc5784b use portrait mode and adjust spaces between labels for umeng xcode project 2013-04-28 16:04:41 +08:00
minggo 82069860e8 Merge https://github.com/cocos2d/cocos2d-x 2013-04-28 15:49:01 +08:00
minggo 660509277b update changelog 2013-04-28 15:25:05 +08:00
minggo e6d17a5be2 Merge pull request #2488 from natural-law/master 
Update the umeng SDK
 2013-04-28 00:12:00 -07:00
natural-law 325faa4736 Update the umeng SDK to new version(for iOS) 2013-04-28 13:58:26 +08:00
minggo 1a598a8c68 update version 2013-04-28 13:48:18 +08:00
minggo d9421fce3e Merge pull request #2486 from minggo/master 
fix some bugs
 2013-04-27 20:21:49 -07:00
minggo 55e4de40f6 make AssetsManagerTest and TestLua run on iOS device 2013-04-28 11:19:03 +08:00
zhangbin a38ea6792b Update the umeng SDK to new version. 2013-04-28 10:30:20 +08:00
minggo 3c1480c4f3 Merge https://github.com/cocos2d/cocos2d-x 2013-04-28 09:47:45 +08:00
minggo 1b085cc86d Merge pull request #2482 from dumganhar/js-stack-size 
Using the same native stack size for DEBUG and RELEASE target.
 2013-04-27 18:37:09 -07:00
minggo 7f2a7373b2 Merge https://github.com/cocos2d/cocos2d-x 2013-04-28 09:30:05 +08:00
Sergey Shambir 44a6be80d2 More verbose logging in removeChildByTag and getActionByTag 
Tags are often hardcoded, so tag value will be useful to detect problem.
 2013-04-27 23:15:00 +04:00
minggo 38e96cbe24 Update AUTHORS 2013-04-27 23:53:31 +08:00
James Chen 2d27353dd3 Using the same native stack size for DEBUG and RELEASE target. 
#define JSB_MAX_STACK_QUOTA 500000
 2013-04-27 23:49:04 +08:00
minggo cb8f069ae6 Merge pull request #2466 from Weeds/fix-loadAsyncImage 
don't use named semaphore for syncing image loading thread
 2013-04-27 08:47:48 -07:00
Andre Rudlaff 43615fe0a7 don't use named semaphore in HttpClient 
this patch removes using named semaphores for Http requests.
This also destroys the mutexes from CCTextureCache when the thread is
destroyed
 2013-04-27 17:44:33 +02:00
minggo cd0cf6eee9 Merge https://github.com/cocos2d/cocos2d-x 2013-04-27 18:30:41 +08:00
James Chen 6d9fc055e4 Merge pull request #2480 from dumganhar/master 
Don't export classes in scripting/lua/cocos2dx_support.
 2013-04-27 03:25:40 -07:00
James Chen c70d9f203a Don't export classes in scripting/lua/cocos2dx_support. 2013-04-27 18:24:08 +08:00
James Chen 65b23ca18e Merge pull request #2479 from dumganhar/master 
Updating JS-Test.
 2013-04-27 03:00:16 -07:00
James Chen 52efa87b69 Updating JS-Test. 2013-04-27 17:59:22 +08:00
James Chen 33d1ccce1f Merge pull request #2478 from natural-law/master 
Update iOS projects of plugin.
 2013-04-27 02:35:07 -07:00
zhangbin 1db8ecd8e4 Update the iOS projects of plugin. 2013-04-27 17:29:20 +08:00
James Chen 20dcaef7b4 Merge pull request #2477 from dumganhar/rohankuruvilla-cocosplayer 
Merging Pull Request #2400
 2013-04-27 02:24:58 -07:00
minggo afb91e752d include cocos2d.h to make android template work 2013-04-27 17:16:27 +08:00
James Chen 50255d772e [CocoPlayer] Small fix for iOS project. 2013-04-27 17:15:57 +08:00
James Chen 8f6a271b54 Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer 2013-04-27 16:55:29 +08:00
James Chen b08152d001 Merge pull request #2475 from dumganhar/bb-fixes 
Some fixes for blackberry template.
 2013-04-27 00:27:34 -07:00
James Chen 3c3cd48a99 [Blackberry] Deleting "create-blackberry-project.sh/.vbs", plz use tools/probject-creator instead. 2013-04-27 15:22:19 +08:00
James Chen 3ce8de8904 [BB]Adding COCOS2D_DEBUG=1 . 2013-04-27 15:17:18 +08:00
James Chen 7f128cfd11 [BB] Updating project configuration of multi-platform-lua. 2013-04-27 15:16:29 +08:00
James Chen 02afbaaa53 Fixing errors in multi-platform-lua for BB. 2013-04-27 15:08:28 +08:00
James Chen cf53d264f9 [Blackberry] Adding .gitkeep, updating bb project for multi-platform-lua 2013-04-27 15:04:55 +08:00
minggo 651a42beaf set design resolution for WatermelonWithme 2013-04-27 14:54:53 +08:00
James Chen 7f70a4c6e8 Merge pull request #2474 from dumganhar/bb-fixes 
Some fixes for Blackberry port.
 2013-04-26 23:48:12 -07:00
James Chen 91036225c3 [Lua] Fixing "memset" and "memcpy" can't be found on BB port. 2013-04-27 14:45:00 +08:00
James Chen eb0358fda6 [Lua] Passing full path to luaL_dofile in CCLuaEngine::executeScriptFile. 2013-04-27 14:44:20 +08:00
James Chen 9739477881 A fix of include file. 2013-04-27 14:41:58 +08:00
James Chen 0d18032f38 [Blackberry] Adding the resources of TestCpp for TestLua. 2013-04-27 14:41:30 +08:00