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

731 Commits

Author SHA1 Message Date
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