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

812 Commits

Author SHA1 Message Date
James Chen 0f2719fa06 issue #2340: Checking jsc( js compiled) files first. 2013-06-27 17:20:02 +08:00
James Chen 2a688f67c9 closed #2340: Updating spidermonkey library for iOS. 2013-06-27 16:23:00 +08:00
James Chen 9781e10476 closed #2340: Upgrading SpiderMonkey to Firefox v22. 2013-06-27 16:10:38 +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
Ricardo Quesada 880a2a53f6 Merge branch 'develop' into js_mac 2013-06-26 18:38:55 -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
CocosRobot b681238425 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-26 09:07:45 +00:00
James Chen 057d5c18a4 issue #2305: sched_yield(); --> std::this_thread::yield(); 2013-06-26 14:55:20 +08:00
James Chen adf6932543 issue #2305: Using std::thread instead of pthread for ScriptingCore. 2013-06-26 14:41:19 +08: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
samuele3hu 46bcf6ddba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle 2013-06-25 15:22:14 +08:00
samuele3hu 3b058fe019 issue #2276: Add OpenGL lua module 2013-06-25 14:55:57 +08:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 24d32010d6 Compilation errors in ScriptingCore.cpp fixes 2013-06-21 22:29:48 +08:00
samuele3hu b9d79293cd issue #2276: Modify InitLuaScrollView to initLuaScrollView 2013-06-21 15:46:59 +08:00
samuele3hu a6d072e679 issue #2276: Modify LuaScrollView create method 2013-06-21 15:42:39 +08:00
samuele3hu 7d0c073215 issue #2276: Modify vs2012 solution config 2013-06-21 14:57:17 +08:00
samuele3hu 6d71b41101 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 14:18:26 +08:00
samuele3hu e36c6f544a issue #2276: Modify ScrollView and LuaScrollView class 2013-06-21 14:17:41 +08:00
James Chen 1608f4b286 Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblua project. 2013-06-21 12:07:31 +08:00
samuele3hu a862543a4c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 10:44:03 +08:00
samuele3hu c527fecfe3 issue #2276: Add scrollview sample test in cocosbuilder and modify some config 2013-06-21 10:43:02 +08:00
Sam Clegg 60bfca0e45 [NaCl] Remove missing functions from lua stdlib. 
NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
 2013-06-20 12:56:15 -07:00
Sam Clegg 203d2e4559 Fix compile warnings in LuaOpengl.cpp 2013-06-20 12:56:12 -07:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
samuele3hu 71fe43ee97 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-20 22:40:21 +08:00
samuele3hu 15c69563e2 issue #2276: Add ScrollView lua binding and test sample 2013-06-20 22:39:30 +08:00
James Chen de0e683014 Merge pull request #2949 from dumganhar/develop 
Bug fixes for the tool to generate luabindings.
 2013-06-20 05:56:50 -07:00
James Chen 1b66a98390 Bug fixes for the tool to generate luabindings. 2013-06-20 19:00:23 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
CocosRobot e651c40d66 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-20 08:25:36 +00:00
James Chen 36d82c9384 closed #2129: Updating LuaCocos2d.cpp. 2013-06-20 15:10:44 +08:00
James Chen 9cbf513c9e issue #2129: jsb_CCXXX --> jsb_XXX 2013-06-20 14:58:33 +08:00
James Chen ba1fe39d91 issue #2129: Removing CC prefix for scripting module. 2013-06-20 14:33:59 +08:00
samuele3hu fb075d7a7d issue #2277: Delete some conflict file and resolve some error 2013-06-20 11:28:16 +08:00
samuele3hu 0c4f99080b issue #2277: modify platform config except win32 2013-06-20 10:19:46 +08:00
samuele3hu b818001007 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-19 16:43:15 +08:00
samuele3hu b48cf5997d issue #2277: Add OpenGL lua test samples 2013-06-19 16:40:02 +08:00
James Chen e432496dc4 Merge pull request #2869 from xyhl515/develop 
issue #2307: JSB function getCPBody return type is not right.
 2013-06-18 23:56:21 -07:00
CocosRobot d418d16fa9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-19 04:51:43 +00:00
James Chen 3cfb2b86c1 issue #2300: invoking clone(c++) method when cc.Action.copy() is called. 2013-06-19 12:09:18 +08:00
James Chen 504a9e714e issue #2300: copy --> clone for luabinding. 2013-06-19 12:08:26 +08:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
samuele3hu 778708426c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-17 14:38:08 +08:00
samuele3hu 26f1bd5171 issue #2277: Add OpenGL lua binding 2013-06-17 14:19:00 +08:00
CocosRobot a9559c0db6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-16 03:08:06 +00:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
CocosRobot 96d12bc1b9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-14 06:24:17 +00:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 1f2f366ef6 Merge pull request #2868 from folecr/develop 
fixed #2281: When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes
 2013-06-12 23:52:53 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
xyhl515 9ea4f7ea8e fix Jsb function getCPBody return type bug 2013-06-11 11:04:29 +08:00
folecr 99266d19c5 If user has enabled debugger support, call enableDebugger() to setup the debug context, start the debugger thread, etc. 2013-06-10 11:38:31 -07:00
James Chen 88b67c7961 [Marmalade] Updating scripting/lua/proj.marmalde/lua.mkf. 2013-06-10 14:56:24 +08:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
samuele3hu ad0ade46ce fix issue #2103: modify AudioEngine module read-only 2013-06-09 11:38:18 +08:00
samuele3hu bc699c1c1e issue #2103 modify AudioEngine framework and CocosDenshionTest sample 2013-06-09 10:32:23 +08:00
James Chen 8e29638435 Merge pull request #2821 from samuele3hu/audioEngine 
Encapsulating SimpleAudioEngine to AudioEngine in lua and updating CocosDenshionTest.lua
 2013-06-08 02:59:30 -07:00
James Chen 32609aeeef Merge pull request #2824 from edwardzhou/master 
Cast variables to their own type, and print warning info if no corresponding lua callback function instead of crash
 2013-06-08 00:01:55 -07:00
samuele3hu 836bfe1d3f issue #2103 modify audioEngine table name to AudioEngine 2013-06-08 14:06:19 +08:00
Edward Zhou 00629f6cb9 1) cast variables to their own type; 2) print warning info if no corresponding lua callback function instead of crash; 2013-06-08 13:28:06 +08:00
CocosRobot b7fdf5a0a8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-08 03:33:22 +00:00
samuele3hu 34b4cb48ab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine 2013-06-08 11:25:51 +08:00
samuele3hu 4be415cc04 issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua 2013-06-08 11:23:21 +08:00
CocosRobot f036f7b881 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-08 02:48:40 +00:00
James Chen 007a33f89a Merge pull request #2809 from edwardzhou/master 
issue #2103: correct the type detecting order for Lua CCBProxy::getNodeTypeName.
 2013-06-07 19:37:19 -07:00
James Chen 5c8d4378a6 Fixing compilation errors in TestLua for Win32. 2013-06-07 21:23:15 +08:00
Edward Zhou 9cc351f47b correct the type detecting order forgetNodeTypeName 2013-06-07 19:49:22 +08:00
James Chen 43e8573d8b Merge pull request #2807 from dumganhar/master 
[BB] Updating project configuration.
 2013-06-07 03:49:10 -07:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
samuele3hu 50f44db9a8 issue #2103 add webSocket lua test sample 2013-06-07 17:02:00 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
samuele3hu 16a34b0da3 issue #2103 add webSocket lua test sample 2013-06-07 16:51:50 +08:00
samuele3hu a2cf4933c4 issue #2103 add webSocket lua test sample 2013-06-07 14:57:36 +08:00
samuele3hu f58d0a04aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 12:57:04 +08:00
samuele3hu c021f700d3 issue #2103 add webSocket lua test sample 2013-06-07 12:54:39 +08:00
folecr 4a9504717b Fix flags for debugger server socket 
* Works on iOS and Android
 2013-06-07 10:55:44 +08:00
James Chen 736fe3c63a Merge pull request #2792 from folecr/jsdb 
Fix flags for debugger server socket
 2013-06-06 19:45:33 -07:00
samuele3hu 5986d3904d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 10:14:12 +08:00
samuele3hu 66d4acc31a issue #2103 add webSocket lua test sample 2013-06-07 10:12:01 +08:00
CocosRobot 919d24d5b2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-07 01:41:52 +00:00
folecr c01c9c8350 Fix flags for debugger server socket 
* Works on iOS and Android
 2013-06-06 07:35:54 -07:00
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +08:00
CocosRobot 42f3b3ccfa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-06 08:33:16 +00:00
James Chen 8c3b1899bb Removing unreadable print in CCBReaderLoad.lua. 2013-06-06 14:23:30 +08:00
James Chen ba295d416f [Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master] 2013-06-06 10:19:46 +08:00
James Chen 3c69a17752 [Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey. 2013-06-06 10:12:44 +08:00
CocosRobot 8c6d6e9ef8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-05 13:01:25 +00:00
James Chen a5263673fb Fixing compilation errors on Android. 2013-06-05 19:56:23 +08:00
minggo 271d1fa55a Merge pull request #2772 from minggo/lua-win32 
issue #2103:make HelloLua & TestLua work on vs2010
 2013-06-05 03:15:09 -07:00
minggo cdf09c04ea issue #2103:make HelloLua & TestLua work on vs2010 2013-06-05 17:43:49 +08:00