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

648 Commits

Author SHA1 Message Date
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +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 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 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
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 bfbbb7bbfd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:35:56 +00: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 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
folecr fa8b2005c3 Spidermonkey for Android/x86 2013-06-01 23:28:37 +08:00
CocosRobot 49780e3fcb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:32:21 +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