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

8942 Commits

Author SHA1 Message Date
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
James Chen 6f5970491e [Blackberry] Adding resources for TestLua. 2013-04-27 14:17:14 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
zhangbin 4db988f51d Change the package name of project HelloIAP-JS. 2013-04-27 13:47:27 +08:00
James Chen cbfa89868b Merge pull request #2473 from natural-law/master 
Update JS bindings in plugin for the new interfaces.
 2013-04-26 20:59:25 -07:00
zhangbin 30a2e55adf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-27 11:35:54 +08:00
minggo de60057621 Merge pull request #2472 from minggo/master 
disable depth test for clipping test
 2013-04-26 20:34:38 -07:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +08:00
zhangbin e2c3d33a77 Update the JS bindings for plugin. 2013-04-27 11:32:12 +08:00
James Chen a2248258b0 Merge pull request #2471 from dumganhar/master 
[Linux]Updating template of multi-platform-cpp
 2013-04-26 20:19:11 -07:00
minggo 9f7d091e95 Merge pull request #2470 from minggo/master 
disable menutest in lua
 2013-04-26 20:18:23 -07:00
James Chen ec3d870231 [Linux]Updating template of multi-platform-cpp 2013-04-27 11:18:09 +08:00
minggo ff207b68e0 disable menutest in lua 2013-04-27 11:17:10 +08:00
James Chen c60224a3c4 Merge pull request #2441 from natural-law/master 
Add social protocol & plugin twitter
 2013-04-26 19:36:13 -07:00
James Chen eeb1965710 Merge pull request #2468 from dumganhar/master 
[HelloLua] print ~> cclog
 2013-04-26 18:50:07 -07:00
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +08:00
James Chen 98a2cdaf28 Merge pull request #2467 from dumganhar/master 
Fixing compilation errors for linux port.
 2013-04-26 18:35:05 -07:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
Rohan Kuruvilla d7020a7ab2 Adding new status messages for Android 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla 8209fa56a2 Fixing bug where screen rotate would keep creating new NSD services 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla eb85a6c1fb Handle evalScript from JNI. Also adds helpers for settings status 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 615329eee5 Add evalScript over the network code and force portrait mode on stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 374c456749 change orientation to Portrait on CCB Stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla ece710c4d8 Adding eval script wrapper for ScriptingCore to AppDelegate 2013-04-26 13:41:15 -07:00