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

10276 Commits

Author SHA1 Message Date
James Chen b61687ef46 Merge pull request #3009 from dumganhar/travis-jsb-fix 
Fixing travis errors for generating JSB glue codes.
 2013-06-26 01:59:22 -07:00
James Chen cde809951a Fixing travis errors for generating JSB glue codes. 2013-06-26 16:57:08 +08:00
minggo 8938268183 issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
James Chen a31918deaa Merge pull request #3007 from dumganhar/iss2313-bind-clipnode 
issue #2313: Exposing cc.ClippingNode to JS.[Not finished]
 2013-06-26 01:36:44 -07:00
James Chen 14208cfda9 Only skip ^visit$ 2013-06-26 16:35:41 +08:00
James Chen e1b1eee46d issue #2313: Ignores `visit` and exposes ClippingNode to JS. [Not finished] 2013-06-26 16:29:45 +08:00
James Chen afc7e39d0f issue #2313: Opens stencil for TestJavascript. 2013-06-26 16:28:14 +08:00
zhangbin 4a9a1261ef Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-26 16:05:10 +08:00
James Chen 4074d89939 Merge pull request #3000 from natural-law/develop 
Add ProtocolUser for user system.
 2013-06-26 01:01:01 -07:00
zhangbin d8e9e2ef1c issue #2334, Update the SDK of ND91 to newest version. 2013-06-26 15:52:42 +08:00
minggo 6f79ea94ac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem 2013-06-26 15:42:38 +08:00
minggo d3c10408ff Merge pull request #3006 from minggo/iss2305-replace-pthread 
fix some errors of c++11 thread usage in CCTextureCache
 2013-06-26 00:40:17 -07:00
James Chen ea452c0a1a Merge pull request #3005 from dumganhar/iss2305-std-thread 
issue #2305: Using std::thread instead of pthread for ScriptingCore.
 2013-06-26 00:17:23 -07:00
minggo ca2966745e closed #2305: fix a running time error 2013-06-26 15:11:13 +08:00
James Chen 057d5c18a4 issue #2305: sched_yield(); --> std::this_thread::yield(); 2013-06-26 14:55:20 +08:00
minggo 9d44b52ebf issue #2305:use c++11 thread correctly 2013-06-26 14:48:19 +08:00
minggo 72937aa6d8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2305-replace-pthread 2013-06-26 14:47:31 +08:00
James Chen adf6932543 issue #2305: Using std::thread instead of pthread for ScriptingCore. 2013-06-26 14:41:19 +08:00
zhangbin 9205880135 Modify the target version of plugin samples to android-10. 2013-06-26 14:37:24 +08:00
zhangbin f0d1df426f Modify the min sdk version of android platform required in plugin samples. 2013-06-26 14:14:40 +08:00
minggo f531842735 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem 2013-06-26 14:02:16 +08:00
James Chen 456f422c8a Update AUTHORS [ci skip] 2013-06-26 14:44:24 +09:00
James Chen 10f4446596 Merge pull request #2998 from sbc100/emscripten_linux 
closed #2333: 1) Share top level Makefile between emscripten, linux and nacl.
2) Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
 2013-06-25 22:43:16 -07:00
James Chen bd3106fef2 Update AUTHORS [ci skip] 2013-06-26 13:59:09 +09:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake 
close #2332: [Linux] Adding project part for QtCreator.
 2013-06-25 21:57:20 -07:00
James Chen 790ec1a953 Merge pull request #3003 from dumganhar/iss2305-std-thread 
issue #2305: [Win32] Removing the third party library pthreadVCE2.
 2013-06-25 21:54:39 -07:00
James Chen 229e181625 issue #2305: [Win32] Removing the third party library pthreadVCE2. 2013-06-26 12:52:38 +08:00
James Chen 7797967080 Merge pull request #3001 from dumganhar/iss2305-std-thread 
issue #2305: Using c++11 std::thread instead of pthread for HttpClient class.
 2013-06-25 20:50:42 -07:00
James Chen ae737365d7 issue #2305: Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50)); 2013-06-26 11:34:04 +08:00
James Chen ea36707c57 issue #2305: Using the old logic of "wait". 2013-06-26 11:10:19 +08:00
James Chen 3ad11cc63a issue #2305: Fixing a bug that passing wrong mutex parameter to "wait". 2013-06-26 11:06:13 +08:00
James Chen f2ab73c533 issue #2305: Reverting to use lock and unlock for HttpClient. 2013-06-26 10:45:46 +08:00
James Chen 8a0046a139 issue #2305: Fixing a crash when error is triggered in WebSocket. Using std::lock_guard to replace lock and unlock manually. 2013-06-26 10:11:10 +08:00
James Chen 79962cdf5d issue #2305: Using c++11 std::thread instead of pthread for HttpClient class. 2013-06-26 10:11:10 +08:00
zhangbin 3d5494019c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-26 09:41:58 +08:00
Sam Clegg f9ae701a4b Fix emscripten build on linux 
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
 2013-06-25 11:47:52 -07:00
Sam Clegg cb2f42d0c6 Share top level Makefile between emscripten, linux and nacl. 
Remove the custom top level Makefile.emscripten and instead
add build-emscripten.sh which can be used like build-linux.sh
and build-nacl.sh.

Also, use the top level lib folder to store emscripten libs.
This brings it in line with the other make-based builds.
 2013-06-25 11:45:01 -07:00
Ricardo Quesada c22ebb154d Merge branch 'develop' into js_mac 2013-06-25 10:21:26 -07:00
Ricardo Quesada 297c63cd5e jsbidings for mac 2013-06-25 10:19:55 -07:00
James Chen 4196f2036e Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix 
issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
 2013-06-25 08:41:28 -07:00
James Chen 3e052d5525 issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library. 2013-06-25 23:21:06 +08:00
zhangbin 2d8fc3f7d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-25 18:19:05 +08:00
zhangbin 26674d1e23 Merge branch 'develop' into ForUser 2013-06-25 18:17:54 +08:00
zhangbin f8a22bb134 closed #2317, Add sample project HelloUser. 2013-06-25 18:05:03 +08:00
zhangbin 1a6bfc0bf6 issue #2317, Add plugin qh360 . 2013-06-25 18:03:04 +08:00
zhangbin 5d4db95fed issue #2317, Adjust ProtocolUser for actual situation. 2013-06-25 18:00:50 +08:00
minggo 28c69b8b16 Merge pull request #2990 from minggo/ccx_filesystem 
fixed a compiling error of AssetsManager on Android
 2013-06-25 02:36:34 -07:00
minggo 6539fd52ba Merge pull request #2989 from samuele3hu/glMoudle 
issue #2276: Add OpenGL lua module
 2013-06-25 02:23:15 -07:00
minggo 98249ef8c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem 2013-06-25 17:14:01 +08:00
minggo 86646bb820 issue #2329:fixed a compiling error of AssetsManager on Android 2013-06-25 17:09:10 +08:00