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

10094 Commits

Author SHA1 Message Date
boyu0 2cccadeaab closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-06-28 10:12:55 +08:00
minggo 4dd2b07a32 Merge pull request #3019 from Squallium/develop 
removed libxml2 dependence from libcocos2d
 2013-06-27 00:13:48 -07:00
minggo daac52d972 Merge pull request #3018 from boyu0/bug2327 
Fixed Bug#2327:CCNode::isScheduled() is not implemented
 2013-06-26 23:59:04 -07:00
Squallium f53e4f692f removed libxml2 dependence from libcocos2d 2013-06-27 08:30:55 +02:00
boyu0 9d227f6f1f Fixed Bug#2327:CCNode::isScheduled() is not implemented 
Add CCScheduler::isScheduledForTarget() method
 2013-06-27 12:05:47 +08:00
James Chen b4ec9efaf9 Update AUTHORS [ci skip] 2013-06-27 11:50:39 +08:00
James Chen 00d6510a0d Merge pull request #3014 from wtyqm/develop 
close #2338: fix sub ccb node resource root path bug
 2013-06-26 20:49:00 -07:00
James Chen 234dca4c41 Merge pull request #3015 from natural-law/develop 
closed #2334: Add user login & logout functions in plugin nd91.
 2013-06-26 20:36:43 -07:00
James Chen fe8113bd46 Update AUTHORS [ci skip] 2013-06-27 11:35:08 +08:00
James Chen e072d5ff36 Merge pull request #3013 from hawkwood/develop 
closed #2337: EditBox doesn't show any text in TestJavascript/ExtensionsTest/EditBoxTest.
The hidden property of UITextField is always NO when it's initialized but the keyboard is not opened.
We should set hidden property to YES right after it's initialized.
 2013-06-26 20:33:16 -07:00
zhangbin 6f34a59075 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-27 11:07:25 +08:00
zhangbin 3c060fbcd8 closed #2334, Add user login & logout functions in plugin nd91. 2013-06-27 10:57:13 +08:00
minggo d2940bf4c7 Merge pull request #3008 from minggo/ccx_filesystem 
remove unneeded codes when using assets manager
 2013-06-26 18:53:34 -07:00
wtyqm ab36c433fa fix sub ccb node resource root path bug 
When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
 2013-06-27 09:41:38 +08:00
Justin Hawkwood 9067918d73 Set textview_hidden to true on init 2013-06-26 13:44:49 -07:00
James Chen 30fa9e80d3 Merge pull request #3012 from dumganhar/ios-project-fix 
Fixing iOS workspace project, using c99 instead of gnu99.
 2013-06-26 02:55:01 -07:00
James Chen 0fdf4b97d6 Fixing iOS workspace project, using c99 instead of gnu99. 2013-06-26 17:52:54 +08:00
minggo 7e26a86e2e issue #2329:not bind CCFileUtils private function 2013-06-26 17:36:31 +08:00
James Chen 2a3d3279d3 Merge pull request #3011 from CocosRobot/updategeneratedsubmodule_1372237663 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-26 02:10:36 -07:00
CocosRobot b681238425 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-26 09:07:45 +00:00
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