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

8929 Commits

Author SHA1 Message Date
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00
Pranav Tekchand 0a996804fa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-30 21:06:18 +05:30
Michael Chinen be2f20e213 Fix missing protocol method warning for iOS 6.0 addition 2013-05-01 00:35:17 +09:00
Pranav Tekchand 4360c3bff8 Support negative scaling of CCScrollView. 
Not checking for it in CCScrollView::getViewRect causes intersectsRect calls (eg: to check if the touch was within the bounds) to return false.
 2013-04-30 20:47:38 +05:30
sunzhuoshi 077214c419 Modified to ensure no popup notify when no byte code file 2013-04-30 20:39:06 +08:00
sunzhuoshi 29d37ad4ec Fixed issue when used via pipe 2013-04-30 17:18:23 +08:00
sunzhuoshi 17f16e16fc Added README 2013-04-30 14:03:54 +08:00
James Gregory 13947c4c23 Add missing file from CocosDenshion. 2013-04-29 17:13:24 -07:00
Sam Clegg 52791bd85d Add .travis.yml 
This builds all libraries and examples in both debug
and release for Linux and NaCl platforms.

Add travis build status image to README.mdown.

Also, split the linux dependency installation into
its own script: install-deps-linux.sh
 2013-04-29 16:46:51 -07:00
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
sunzhuoshi d4832e3f46 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
 2013-04-30 03:51:07 +08:00
sunzhuoshi 163c19fac2 Added support for javascript byte code 2013-04-30 03:29:56 +08: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
Hojin Choi 8b9644150d Changes samples' function prototypes to apply newly introduced callback type. 2013-04-28 23:42:31 +09: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
Hojin Choi a9ace2505e Introduce HttpResponse callback selector type. to resolve #2365 2013-04-28 03:55:58 +09:00
tiantian 2ba5035e5a Make sure XMLDocument is deleted; Code clean up; Add test; 2013-04-28 00:36:37 +08:00
Andre Rudlaff 3bd67a47fa Fixed crash in HttpClient request on 64Bit 
According to the cURL documentation the pointer that should be passed
to curl_easy_getinfo with CURLINFO_RESPONSE_CODE must be a long
pointer,

On platforms where long is 64Bit this will cause a stack corruption
destroying the pointer to the original resonse as the current response
code variable was a 32 Bit int value.

See: http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html
 2013-04-27 17:55:07 +02: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