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

998 Commits

Author SHA1 Message Date
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
CocosRobot 7e866d8060 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-05 08:43:03 +00:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
James Chen 5d92a98287 fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash. 2013-06-05 14:55:13 +08:00
James Chen d0c0d303f5 fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash. 2013-06-05 14:31:07 +08:00
CocosRobot 0bc9c19e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 10:36:03 +00:00
CocosRobot be08d6c81d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 05:23:21 +00:00
James Chen a597323734 Merge pull request #2739 from dumganhar/iss2247-proxy-function-develop 
fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
 2013-06-03 22:02:45 -07:00
James Chen 6cc3ba9a5d fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 13:02:02 +08:00
James Chen 64dec0df56 fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-04 13:01:50 +08:00
James Chen 58205ff322 fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 12:53:42 +08:00
CocosRobot be8ed6e3a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 03:20:16 +00:00
James Chen bba2d2bbdc fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-03 22:31:24 +08:00
samuele3hu 23eec2f1ce issue #2103 modify some compile setup 2013-06-03 18:14:06 +08:00
samuele3hu 9352b60653 issue #2103 modify some compile setup and del some resource file 2013-06-03 17:40:31 +08:00
samuele3hu 0d33d909c9 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder 2013-06-03 17:15:57 +08:00
samuele3hu bf1cd2e909 issue #2103 modify some compile setup 2013-06-03 16:56:45 +08:00
samuele3hu db7a2a1290 issue #2103 modify some compile setup and delete some deprecated lua function 2013-06-03 16:07:06 +08:00
CocosRobot 8912ff963d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:49:49 +00:00
CocosRobot bfbbb7bbfd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:35:56 +00:00
James Chen 86af06c909 fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:32:07 +08:00
James Chen 7cf2f88c3b fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:22:28 +08:00
samuele3hu 7101bc4377 issue #2103 remove simple cocosbuilder sample 2013-06-03 14:59:04 +08:00
samuele3hu af0737ce87 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder 2013-06-03 13:48:12 +08:00
samuele3hu afa6b81ba7 issue #2103 add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
James Chen 66e6630f37 fixed #2243: XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:40:31 +08:00
James Chen bb4d52a75c fixed #2243: XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:39:18 +08:00
James Chen 2fdeab46b1 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:12:55 +08:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
James Chen d0680258c6 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:03:38 +08:00
James Chen f2f0f031c7 fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 09:55:43 +08:00
James Chen 4b8f76c903 WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-02 18:56:49 +08:00
James Chen 85d2ccbf65 issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive. 2013-06-02 18:56:39 +08:00
James Chen 2218d70826 fixed #1647: Adding missing files. 2013-06-02 18:56:17 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-02 18:55:57 +08:00
James Chen 7b25d61824 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into websocket 2013-06-01 23:33:01 +08:00
folecr fa8b2005c3 Spidermonkey for Android/x86 2013-06-01 23:28:37 +08:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
James Chen d5f45466a9 issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive. 2013-06-01 07:58:23 +08:00
James Chen 669066b954 fixed #1647: Adding missing files. 2013-05-31 23:25:01 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
folecr c7ce3d10d3 Spidermonkey for Android/x86 2013-05-30 17:18:17 -07:00
CocosRobot 49780e3fcb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:32:21 +00:00
CocosRobot 0f64be0ce4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:19:13 +00:00
CocosRobot bad653a900 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-24 09:31:15 +00:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
Carsten Sandtner 820983f40c Fixed setHeader while Android had problems with stringstreams. 2013-05-23 14:37:32 +02:00
samuele3 bfce20d1ae Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 17:51:06 +08:00
CocosRobot 41c7adb532 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-23 09:40:35 +00:00
samuele3 5da5407efe issue #2103 add menu test lua sample 2013-05-23 15:39:41 +08:00
James Chen 10ba265f46 Merge pull request #2614 from pyrasis/tizen_2.1 
Adding lua libaray and sample projects for Tizen.
 2013-05-22 06:12:17 -07:00
Lee, Jae-Hong 6acd8c66c2 Adding lua libaray and sample projects for Tizen. 2013-05-22 21:45:53 +09:00
James Chen 974546557d fixed #2214: Upgrading Spidermonkey to Firefox v21 2013-05-22 17:31:07 +08:00
James Chen e21926edb8 fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash. 2013-05-22 11:56:47 +08:00
CocosRobot 552082d491 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 10:36:26 +00:00
CocosRobot 8a56b1627d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 07:36:03 +00:00
James Chen 1128f9dfc6 Merge pull request #2564 from folecr/jsdb 
fixed #2187: JavaScript debugger improved and bugfixed.
 2013-05-21 00:31:51 -07:00
CocosRobot c454fe62df [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 06:58:43 +00:00
James Chen 66e631fd35 Merge pull request #2590 from smshuja/master 
fixed #2186: New PivotJoint will now accept 3 or 4 parameters like in html5 version.
 2013-05-20 20:20:13 -07:00
folecr 554213d0eb Match CocosPlayer's JSB_DEBUGGER_PORT 2013-05-20 14:30:41 -07:00
folecr cf328b5592 Set socket option SO_NOSIGPIPE for IOS 2013-05-20 14:30:41 -07:00
folecr 95487da933 clearBuffers() and JSBDebug_BufferWrite() will both immediately write data in the output buffer to the socket. 
* Note : comments in the code say that locking is not an issue. This should be reviewed.
 2013-05-20 14:30:41 -07:00
folecr 923d12fa48 Clean up debugger server 
* Remove perpetual innner while loop
    * Macro to TRACE_DEBUGGER_SERVER
 2013-05-20 14:30:40 -07:00
folecr e0708f496a New debugger interface 2013-05-20 14:30:40 -07:00
James Chen db4ee295ee fixed #2092: Adding macro to make sure header file to be included only once. 2013-05-20 21:13:55 +08:00
James Chen 8bdcda7ef2 issue #2092: Bug fix in MinXMLHTTPRequest::send 2013-05-20 21:13:11 +08:00
James Chen d402b349e2 issue #2092: Updating win32 project configuration. 2013-05-20 21:12:25 +08:00
James Chen 9e9b9ca831 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest 2013-05-20 20:55:29 +08:00
Shuja Shabandri be88ba45cd PivotJoint will now take 3 or 4 arguments like in html5 2013-05-20 14:54:34 +04:00
James Chen 5254d3a702 fixed #2092: GC issues fix in XMLHttpRequest. 2013-05-20 17:47:47 +08:00
James Chen 55be2f004c issue #2092: Removing unused code in XMLHttpHelper.h 2013-05-20 17:46:32 +08:00
minggo ad45c24c9a Merge pull request #2574 from minggo/AssetsManager-asynchronization 
Fix compiling error of AssetsManager project on windows
 2013-05-20 01:36:35 -07:00
James Chen 9d385dbd71 Merge branch 'XMLHttpRequest_cchttpclient' of https://github.com/zynga/cocos2d-x into zynga-XMLHttpRequest_cchttpclient 2013-05-20 14:02:55 +08:00
Shuja Shabandri 32498521b4 pointQuery first returns invalid instance of Shape 
Signed-off-by: Shuja Shabandri <shuja@shabandri.com>
 2013-05-19 18:39:54 +04:00
minggo b118cf6d72 issue #1859:fix compiling error of ScriptingCore.cpp 2013-05-17 09:57:55 +08:00
Carsten Sandtner 2b2d7cb665 Merge branch 'master' into XMLHttpRequest_Demo 
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
  Update AUTHORS
  Update AUTHORS
  fixed #2155 : Resolve the bug of callback methods in plugin.
  Update AUTHORS
  fix a warning caused by member variables initialization order in constructor
  it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
  initWithStringShadowStroke() renamed to initWithString()
  comment fixed
  fix alignent problem when rendering text with shadow
  fix a problem with float stroke size
  Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
  CCLabelTTF C++ test fixed
  new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
  initWithStringAndTextDefinition() changed method's signature
  no more bingins for ccTextDefinition
  class renamed and moved to ccTypes.h
  CCTextDefinition is passed now by pointers
  bindings for CCTextDefinition
  ccTextDefinition becomes CCTextDefinition
  changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
  ...
 2013-05-16 10:12:19 +02:00
Carsten Sandtner 6e43618004 MinXMLHttpRequest extends from CCObject 
Added MinXMLHttpRequest to Android.mk for Bindings
Added newline at header as compiler threw a warning.
 2013-05-16 10:11:00 +02:00
carlo morgantini 3b50ffe5ba Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase 2013-05-15 16:37:08 -07:00
carlo morgantini 315999edad new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition 2013-05-15 16:37:08 -07:00
Carsten Sandtner 370a540352 fixed possible memory holes. 2013-05-15 15:15:23 +02:00
Carsten Sandtner 4cb3001fc6 Fixed check for arguments at xhr.send() 2013-05-15 13:57:25 +02:00
Carsten Sandtner 919c347c6d changed method to strip newlines as Android complained. 2013-05-14 17:21:27 +02:00
Carsten Sandtner a7e0a83a2e remove initialization of withCredentialsValue = flase as iso c++ complains it. 2013-05-14 15:50:56 +02:00
Carsten Sandtner 6449d79d60 Fixed some typo 2013-05-14 14:16:22 +02:00
Carsten Sandtner 32d2ee8104 Deactivated Debugging flag. 2013-05-14 13:19:32 +02:00
Carsten Sandtner 1b80208329 Tidied up comments 2013-05-14 12:03:58 +02:00
Carsten Sandtner 2e68188321 Some code cleaning 2013-05-14 11:36:48 +02:00
Carsten Sandtner 915265dd34 Merge branch 'master' into XMLHttpRequest_cchttpclient 
# By Sam Clegg (2) and James Chen (1)
# Via James Chen
* master:
  Update AUTHORS [ci skip]
  Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
  Log assert messages
 2013-05-14 11:19:46 +02:00
James Chen 99664b5998 Merge pull request #2391 from sbc100/log_asserts 
fixed #2152: Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
 2013-05-13 19:56:28 -07:00
Carsten Sandtner d61ee643a9 changed xmlhttprequest to use cchttpclient instead of raw curl. XHR is now async. 2013-05-13 16:57:55 +02:00
Carsten Sandtner e86f11e36a Using CChttpClient instead of curl. 2013-05-10 15:00:03 +02:00
Carsten Sandtner 65eb73f81c activate XMLHttpRequest in bindings.config 2013-05-08 13:13:21 +02:00
Carsten Sandtner 1dccfc70b4 Added Spidermonkey bindings for a synchronous XMLHttpRequest object in JAvascript. 2013-05-08 12:59:07 +02:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
James Chen 9a7c849ce4 fixed #2106: Fixing a bug on android when only jsc files exist. 2013-05-07 10:50:09 +08:00
James Chen bf6bbba6ee Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-07 09:43:24 +08:00
Sam Clegg 4f6de1bcad Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert 
Also remove the first "cond" argument, since it is always false.
 2013-05-06 12:25:13 -07:00
sunzhuoshi fa39c41136 Fixed bad commit 2013-05-06 19:06:16 +08:00
James Chen 9a63b39974 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 18:13:26 +08:00
sunzhuoshi 3da5a7d5cd Removed redundant code 2013-05-06 18:06:18 +08:00
sunzhuoshi 6e70884853 Removed redundant code 2013-05-06 15:43:33 +08:00
James Chen f86a843c8b Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 12:55:44 +08:00
sunzhuoshi d4c4170368 Removed bad comment 2013-05-06 12:02:17 +08:00
James Chen 4657ef716c Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:43:40 +08:00
sunzhuoshi de27f1137a Changed byte code file ext to ".jsc" 
Modified loading logic to load js file first
 2013-05-06 11:32:23 +08:00
James Chen 0718e6cf70 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:15:19 +08:00
minggo 0c721096ec fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval 2013-05-02 09:03:24 +08:00
sunzhuoshi 077214c419 Modified to ensure no popup notify when no byte code file 2013-04-30 20:39:06 +08:00
sunzhuoshi d4832e3f46 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
 2013-04-30 03:51:07 +08:00
sunzhuoshi 163c19fac2 Added support for javascript byte code 2013-04-30 03:29:56 +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
James Chen c70d9f203a Don't export classes in scripting/lua/cocos2dx_support. 2013-04-27 18:24:08 +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 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 edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
Rohan Kuruvilla 2636bafd0c Fixing network logging for Android and iOS 2013-04-25 18:41:29 -07:00
James Chen 1ff07223de Merge pull request #2456 from dumganhar/lua-bytecode-test 
fixed #2083: Bytecode of LuaJIT can't work on android.
 2013-04-25 06:48:01 -07:00
CocosRobot c501a73a54 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 21:30:20 +08:00
James Chen 862ce85c7a fixed #2083: Bytecode of LuaJIT can't work on android. 2013-04-25 21:29:31 +08:00
James Chen 5572990e5d Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop. 2013-04-25 20:56:27 +08:00
CocosRobot 1e4370f43b cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 14:35:16 +08:00
CocosRobot ca30ce7462 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-23 12:11:31 +08:00
James Chen e84cf9ef83 Correct log output in js_cocos2dx_CCTMXLayer_getTiles 2013-04-23 10:57:55 +08:00
James Chen 30c6915449 fix a typo. 2013-04-23 10:52:51 +08:00
CocosRobot 8d8a2293a1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-19 17:27:38 +08:00
James Chen 20b0e41b78 fixed #2017: Binding cc.TMXLayer.getTiles manually. 2013-04-19 17:25:24 +08:00
James Chen 556d95d922 Removing an unused comment in ccaffinetransform_to_jsval. 2013-04-18 14:13:26 +08:00
CocosRobot 5ead6d7322 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-18 13:58:01 +08:00
James Chen 4db3c9c692 Refactoring js_cocos2dx_CCFileUtils_getByteArrayFromFile. 2013-04-18 13:53:16 +08:00
James Chen 642d1746f9 issue #2064: Adding conversation for "jsval ~> CCAffineTransform" and "CCAffineTransform ~> jsval". 2013-04-18 13:50:58 +08:00
James Chen 4bd012dfbf fixed #2060: Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename) 2013-04-17 18:43:57 +08:00
James Chen 63ce8adfad fixed #2059: Fix complication errors on Android. 2013-04-17 17:05:39 +08:00
James Chen ddd6d9d155 fixed #2059: cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string. 2013-04-17 16:08:48 +08:00
James Chen 694c47f5d6 Merge pull request #2382 from wedteam/keypad-support 
fixed #2057: [JSB] Adding response for back and menu keypad event for Android.
 2013-04-16 21:56:37 -07:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
akira_cn e1f9e1a300 update keypad support 2013-04-17 10:40:46 +08:00
James Chen 2384d97ce8 issue #1847: Adding luajit library for win32. 2013-04-17 10:09:17 +08:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
James Chen bbbf139c8d Adding luajit iOS prebuilt library. 2013-04-16 18:19:25 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
akira_cn 54f18be09a add back key support 2013-04-16 10:19:36 +08:00
CocosRobot 5928d2836c cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-16 10:02:11 +08:00
CocosRobot d6e9d4420e cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-15 14:01:47 +08:00
James Chen 0ecf9da3a6 Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg. 2013-04-12 14:27:29 +08:00
James Chen b5bad26a88 fixed #2043: Updating spidermonkey to Firefox v20 for Windows. 2013-04-12 13:38:21 +08:00
James Chen e1ed841b8e fixed #2043: Updating to spidermonkey20 for android. 2013-04-12 12:52:50 +08:00
James Chen fea712fcf8 fixed #2043: Disabled YARR_JIT on ios. 2013-04-12 11:58:53 +08:00
James Chen 42997f7390 Merge branch 'master' into iss2043-upgrade-spidermonkey20 2013-04-12 10:57:33 +08:00
James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master 2013-04-10 16:07:54 +08:00
James Chen d45765ccc4 fixed #2043: Upgrading SpiderMonkey to Firefox20.0. 2013-04-10 11:19:43 +08:00
CocosRobot 40c5280527 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-09 14:49:20 +08:00
James Chen a2c71f8e89 Exposing CCApplication to js. 2013-04-09 14:42:12 +08:00
James Chen 0bab4609ab fixed #1592: Removing some marco definitions in CCTexture2D.pkg. 2013-04-08 14:14:35 +08:00
James Chen 831dfb6ade Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash 2013-04-08 11:56:10 +08:00
James Chen 2c3427dcee issue #1592: Fixing complication errors for windows port. 2013-04-08 11:56:04 +08:00
James Chen ea4603a057 issue #1592: Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h. 2013-04-08 11:55:35 +08:00
James Chen 1a44f776f8 fixed #2005: Adding CurrentLanguageTest for Testlua. 2013-04-07 16:34:07 +08:00
James Chen ef731879f1 Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj 
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
 2013-04-06 20:20:33 -07:00
CocosRobot 3871129c1f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-07 11:13:28 +08:00
James Chen 684c659ba7 Merge pull request #2311 from dumganhar/iss2002-more-luatest 
fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
 2013-04-06 19:45:28 -07:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
Sergej Tatarincev 1510354568 Support variable cell sizes in CCTableView 2013-04-04 17:57:43 +03:00
CocosRobot 0338a3e504 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-04 00:08:15 +08:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen f1d48b41e2 issue #1944: Fixing a typo. 2013-04-03 10:39:40 +08:00
James Chen ad555e70fb issue #1944: Removing commented codes in cc.associateWithNative. 2013-04-03 10:39:15 +08:00
James Chen 6d6bc03465 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj 2013-04-03 10:27:01 +08:00
James Chen 2de4dde0bd Merge pull request #2293 from dumganhar/iss1942-layertest 
fixed #1942: LayerTest for TestLua is ok.
 2013-04-02 02:54:21 -07:00
James Chen a73395507c fixed #1942: LayerTest for TestLua is ok. 2013-04-02 17:52:08 +08:00
minggo e8ba299b80 Merge pull request #2289 from DenizPiri/master 
print() function in LUA should write to android device log (adb logcat)
 2013-04-01 22:42:17 -07:00
CocosRobot 1462c2a570 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-02 12:01:52 +08:00
James Chen ec7a2f4c5c fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore. 2013-04-02 11:35:55 +08:00
Deniz Piri c73a6e3b14 LUA: print() function should use CCLOG internally. 
CCLOG uses __android_log_print internally, this allows lua's print() function
to print to android log output and allows developer to see print output from
LUA using "adb logcat".
 2013-04-01 19:16:43 +02:00
James Chen 5fd2acca47 Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding. 2013-04-01 17:39:26 +08:00
CocosRobot 9f50cb71e2 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 17:02:38 +08:00
CocosRobot 7b37a9aaef cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 12:02:51 +08:00
James Chen 92d132ae19 Updating Android.mk to add OpenGL jsb support. 2013-03-29 11:43:25 +08:00
James Chen fd1b056d6a define JSB_INCLUDE_OPENGL in js_bindings_config.h 2013-03-29 11:41:32 +08:00
James Chen b7a86c601a fixing compilation errors for TestJavascript on windows. 2013-03-29 11:16:14 +08:00
James Chen 54edf8cafd Don't require 'jsb_opengl_constants.js' in 'jsb_opengl.js'. It will break js obscure 2013-03-28 16:58:02 +08:00
James Chen 771ffb4368 fixer #1936: Updating "obfuscate_exclude_cocos2d.js". 2013-03-28 16:53:35 +08:00
James Chen 65bcc6035e Fixing a type: "FiniteTimeAction" --> "GLNode". 2013-03-28 16:51:11 +08:00
Rohan Kuruvilla 1d89b137ed Adding new Javascript bindings for OpenGL to cocos2d-x. Modifying bindings generated in cocos2d-iphone 2013-03-27 23:59:29 -07:00
Rohan Kuruvilla 57fd3cdb9c Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template 2013-03-27 23:59:29 -07:00
flamingo 4a313e0ffe Update CCLuaEngine.cpp 
Null pointer check in order to prevent crashes.
 2013-03-26 00:24:47 +04:00
James Chen 0faeb5da5e Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2013-03-22 14:12:38 +08:00
walzer 42c73fb820 Fixed #1841, obfuscated js source can run on iOS correctly now. 2013-03-22 12:06:04 +08:00
James Chen d80d68f7e0 fixed #1855: std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string. 2013-03-22 12:01:08 +08:00
walzer 6f41b7c4ea Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate 2013-03-21 17:37:28 +08:00
walzer 0a252aceaf update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch. 2013-03-21 17:13:24 +08:00
walzer 67cda2bfd4 issue #1841, TestJavascript is obfuscated successfully 2013-03-21 16:55:55 +08:00
CocosRobot 5414a02c9f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 18:36:26 +08:00
James Chen 4bf7f9bad4 Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes. 2013-03-20 18:32:30 +08:00
James Chen 196ff7228d Updating CCLabelBMFont.pkg. 2013-03-20 16:05:45 +08:00
CocosRobot e34d9b18e5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 14:20:23 +08:00
James Chen a38fc50593 Fixing compilation errors for win32. 2013-03-19 19:51:07 +08:00
CocosRobot a115096bec cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 18:05:15 +08:00
walzer 0d73934f5c issue #1841, TestJavascript-ios is obfuscated successfully 2013-03-19 17:21:01 +08:00
CocosRobot afccad27e1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 13:45:54 +08:00
James Chen 7b5e2351c3 Updating jsb_cocosbuilder.js. 2013-03-19 13:08:34 +08:00
James Chen 3380c7cdca fixed #1838: Updating iOS project setting for CocosDragonJS. 2013-03-19 13:05:06 +08:00
Rohan Kuruvilla e4efa88d00 Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc 2013-03-18 20:54:48 -07:00
Rohan Kuruvilla 5ca6648e47 Updating CCBReader JS bootstrap file 2013-03-18 16:06:48 -07:00
James Chen 6a98553633 Synchronizing the submodule reference of cocos2d-js-test to the latest one. 2013-03-18 18:24:37 +08:00
CocosRobot d098eb06aa cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-18 15:41:39 +08:00
James Chen f57a751a48 fixed #1837: Refactoring schedule binding codes. 
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 15:29:53 +08:00
James Chen 3aeb22292b Reverting ccarray_to_jsval. 2013-03-16 21:23:33 +08:00