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

321 Commits

Author SHA1 Message Date
samuele3hu 1eb1057875 Update comments of some header files 2015-03-19 16:59:21 +08:00
samuele3hu 31b34ddf77 Update comments of some header files 2015-03-19 16:45:53 +08:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
byeonggee.seo b3335f34ae Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2 2015-03-03 16:33:48 +09:00
byeonggee.seo 3811c9f1a3 connError added 2015-03-03 16:33:35 +09:00
seobyeongky 91b0104fd0 Fix an issue with iOS HTTP Request code (https://github.com/cocos2d/cocos2d-x/pull/10543) 2015-02-27 21:31:33 +09:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix 
HttpResponse reference counting bug fixed
 2015-02-27 14:32:41 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix 
apply custom request header for every request type (ios)
 2015-02-26 16:40:12 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks 
Fix major memory leaks in iOS http request
 2015-02-26 15:41:10 +08:00
minggo 31e8d0dccd Merge pull request #10521 from ryule/fix_httpclient-ios 
Fixed HttpClient-ios request to work when the data is started by 0x00.
 2015-02-26 10:32:20 +08:00
Mazyad Alabduljaleel 23093b9c53 Just a few more leak fixes 2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel c80312bea6 Two more memory leaks 2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel 3e60e0ddf6 For some reason, this is causing a conflict 2015-02-25 10:44:00 +04:00
mogemimi d384f7ce1e Fix typo: unkown -> unknown 2015-02-24 02:39:50 +09:00
Mazyad Alabduljaleel 839f1a851d One more memory leak fix: 
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
 2015-02-23 11:52:49 +04:00
Mazyad Alabduljaleel a2f9956d00 Fix major memory leaks in iOS http request 
... and other small fixes

Brief:

1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning

**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
 2015-02-23 10:38:33 +04:00
Jongryul Kook c05dd4357d Fixed HttpClient-ios request to work when the data is started by 0x00. 2015-02-18 16:51:12 +09:00
Jeff Oh e33854f3eb apply custom request header for every request type (ios) 2015-02-12 20:07:19 +09:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
byeonggee.seo 23e0320cac HttpResponse reference counting bug fixed 2015-02-02 12:23:15 +09:00
samuele3hu fec0d9c41d Set default value for `Content-Type` of headfield in `PUT` method 2015-01-31 22:15:15 +08:00
samuele3hu 75dc45bfea Remove useless blank line 2015-01-31 15:21:03 +08:00
samuele3hu e6d50d7086 Fix the error that the binary data would be truncated 2015-01-31 14:31:24 +08:00
samuele3hu 93665c5c6d Fix the error that HttpClient didn’t setResponseCode when connecting failed 2015-01-28 13:49:19 +08:00
cpascal 281d231a5d Fixed inconsistent time-scale in Httpclient. 2015-01-19 10:50:42 +09:00
andyque fcfcb4fd71 fix websocket dead lock 2015-01-16 18:43:57 +08:00
huangshiwu 12212dc572 fix HttpAsynConnection method didReciveResponse's process error 2015-01-14 14:01:58 +08:00
huangshiwu 108e4d2b41 Add comments and improve code readability for HttpAsynConnection.m 2015-01-08 10:12:45 +08:00
huangshiwu be02233815 Fix XmlHttpRequestTest parsing error of response header on iOS platform 2015-01-08 00:23:27 +08:00
samuele3hu c91bd076cb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp 2015-01-04 17:10:22 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
minggo 4224319d61 Merge pull request #9775 from huangshiwu/iosnetwork-fixbug 
fix iOS HttpClient immediately mode's bug
 2015-01-04 14:45:18 +08:00
samuele3hu 713de37c5b Fix compile iOS compile error on the Xcode 5.1.1 2015-01-04 13:49:41 +08:00
huangshiwu 79e3e8463d fix iOS HttpClient immediately mode's bug 2015-01-04 10:54:29 +08:00
minggo 161b0a3985 Merge pull request #9727 from samuele3hu/v3_4_httpclient 
Use android network module — HttpURLConnection to replace the libcurl on the android platform
 2014-12-31 13:00:04 +08:00
samuele3hu 3795f9cc2a Rename HttpClient-android.cpp and unify java indent format 2014-12-31 12:03:27 +08:00
huangshiwu 893aded9b7 iOS HttpClient replace libcurl - fix Jenkins compile error 2014-12-31 11:32:35 +08:00
samuele3hu f7ed73c1e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient 2014-12-31 10:17:12 +08:00
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
minggo 2ec85f8c4e Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket 
avoid locking when message queue is empty in websocket
 2014-12-25 14:09:35 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
Vladimir Timofeev 33786678eb Add finding curl. Fix some leftovers from websockets. 2014-11-16 13:55:42 +03:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
Timothy Zhang 59424c0609 replace tabs with spaces. 2014-10-27 09:53:01 +08:00
Timothy Zhang 6d43d5e11e avoid locking when message queue is empty in websocket 2014-10-24 19:09:47 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Keisuke Kobayashi c4d2c5eaed Rename setSSLVerification 2014-09-14 00:28:11 +09:00
Keisuke Kobayashi 6b0879fe93 HttpClient SSL verification 2014-09-13 20:37:36 +09:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Kezhu Wang 925fb9aa38 bugfix: condition variable sleep on unrelated mutex 2014-09-03 23:56:54 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo d3ce2acff6 Merge pull request #7892 from Dhilan007/v3-androidmk 
Adjust android.mk for cocos2d and related module
 2014-08-28 10:16:39 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
samuele3hu ada7fa23d3 Add CC_DLL for related network files 2014-08-22 13:42:46 +08:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
Huabing.Xu bf287252df change libnetwork and libSpine 2014-07-29 09:31:52 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
lite3 07245ebf6e put request param in lambda in HttpClient::networkThreadAlone 2014-06-26 02:03:53 +08:00
lite3 e3eb5aeddd put duplicate code to processResponse 2014-06-22 12:37:23 +08:00
lite3 ebbcb3ea33 change immediateSend to sendImmediate 2014-06-22 11:39:39 +08:00
lite3 cb42f549ce fix: request will be delete in thread. 2014-06-22 00:08:02 +08:00
lite3 758a1f5dc4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-21 17:34:11 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
lite3 77210d60ae fix: can not create networkThread at second create HttpClient. 2014-06-19 22:07:24 +08:00
John_He 3bf4c5e985 fix mingw32/64 build: 
MinGW uses system installed libcurl, rather than libcurl_imp.
 2014-05-30 19:54:59 +08:00
lite3 ae7c93dd4e Merge remote-tracking branch 'upstream/v3' into v3 2014-05-29 20:41:00 +08:00
minggo 05df2a4db1 Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32 
Fixing cmake project for win32
 2014-05-29 15:25:58 +08:00
lite3 dff6b2f338 fix: Incorrect error buffer in two thread 2014-05-23 01:43:32 +08:00
lite3 4679e08c3d networkThreadAlone callback on main thread use lambda 2014-05-21 15:31:58 +08:00
lite3 ed7ecabe8f replace tab to space. 2014-05-21 10:44:07 +08:00
lite3 953ca4a44b Add immediate send request 2014-05-20 20:08:26 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
AlexV 234c902630 fixing cmakelist after merge 2014-05-15 22:26:41 +09:00
AlexV d7f1af876a fixed network link library curl in win32 case : libcurl_imp 2014-05-10 10:07:57 +09:00
Mircea Rila b66b4c6f1d upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 
remove C4005 warnings after upgrading projects
 2014-05-07 17:41:04 +03:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Jason Xu 42c374157d CC_CALLBACK_2 not std::bind directly 2014-04-25 17:32:21 +08:00
Jason Xu 5cc483276b use new ccHttpRequestCallback. 2014-04-25 17:15:57 +08:00
Mazyad Alabduljaleel 40e6288ac7 [NEW]: update HTTPClient to use C++11 callbacks 
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
 2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel 1928a0cb07 = [FIX]: HTTPClient should not report 2xx status codes as errors! 2014-04-09 11:07:51 +04:00
Dale Stammen 6970955378 added wp8 support files and projects 2014-03-28 15:32:52 -07:00
Dale Stammen db8efd32f7 fixed reserved word DELETE in wp8 compiler 2014-03-28 11:26:41 -07:00
James Chen 8f95e27dc7 Merge pull request #5943 from koowolf/websocket_fix 
closed #4542: WebsocketTest crashes on win32, it may delete mutex which is still being locked
 2014-03-25 16:28:18 +08:00
koowolf c37584ee5c closed #4542: fix crash in win32(delete mutex while still lock) 2014-03-25 16:14:21 +08:00
James Chen ae2027ea53 Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp 2014-03-24 17:59:44 +08:00
James Chen e075b82dfe tab -> 4 spaces, whitespace cleanup. 2014-03-24 17:58:35 +08:00
James Chen b6a175457c Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923 2014-03-24 17:55:43 +08:00
Chris Hannon ba37c07053 [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code 
-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
 2014-03-21 11:45:14 -04:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
andyque 629c6b9a89 fixed #3868. Add guard check to send method of HttpClient 2014-03-04 10:07:49 +08:00
James Chen 757425c54b issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
andyque 46c93f07ad fixed #4103. fix crash when websocket close 2014-02-28 17:32:54 +08:00
andyque d4b9544365 fixed #3868. when the singleton destoryed, the cocos thread may later than that which will cause the s_responseQueue to be nil. 2014-02-27 11:25:44 +08:00
andyque e7de92a54f fixed #3868. when singleton delted, it should dispatch callbacks. 2014-02-26 10:59:56 +08:00
James Chen 0658355772 Merge pull request #4415 from HoGarfield/WsThreadHelper 
closed #4103: Potential crash when websocket connection closes
 2014-02-20 20:44:55 +08:00
James Chen e9fa65b6f4 closed #4101: No callback is invoked when websocket connection fails 2014-02-20 19:29:53 +08:00
James Chen dc6839d692 Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232 2014-02-20 19:27:17 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
Raymond Xie d8b1f78039 Update WebSocket.cpp 
bufix: when connecting fail, libwebsocket_client_connect() will return NULL, and onSocketCallback() will not be called, so we need trigger WS_MSG_TO_UITHREAD_ERROR here.
 2014-01-26 15:59:14 +08:00
Dhilan007 b6cd40521e fix link error on vs. 2014-01-25 19:41:20 +08:00
Dhilan007 d0e3a81d18 fix compiling error cause by undefined ssize_t on vs. 2014-01-21 09:52:43 +08:00
James Chen 432534d857 #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes. 2014-01-20 17:31:12 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
WuHuan f87af9e998 fix linux build 2014-01-09 19:49:11 +08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop 
update
 2014-01-09 02:56:21 -08:00
James Chen f8d369248b closed #3605: Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line. 2014-01-09 15:18:06 +08:00
edwardzhou 480a9277da fix WebSocket cannot send/receive more than 4096 bytes of data 2014-01-09 13:29:56 +08:00
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
minggo f2b1a3cc83 Merge pull request #4793 from minggo/namespace 
network -> cocos2d::network
 2014-01-02 00:38:50 -08:00
minggo 07600bd46b network -> cocos2d::network 2014-01-02 16:25:35 +08:00
James Chen 7abeacd86e HttpClient don't have to be inherited from Object, its a singeton, ok? 2014-01-02 15:47:38 +08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
James Chen cc567a3077 issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
James Chen 627a1bf700 issue #2790: HttpClient uses Vector<T> now. 2013-12-10 16:41:13 +08:00
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
garfield_ho bac83f3740 Cancel the onSubThreadEnded callback,because _ws may be deleted in the onClose callback. 2013-12-02 17:19:52 +08:00
signmotion 41daad30fa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-29 19:44:03 +02:00
signmotion 0d9cd9784b * Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float'). 2013-11-23 07:23:06 +02:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
James Chen 91a57c614d closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes. 2013-11-19 00:19:57 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
James Chen f3c40a3e7a issue #3113: 32Bit fix and 13.10 32bit complication is ok. 2013-11-06 14:54:35 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
samuelhu 663b27d1e7 #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:06:02 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
minggo 91eada6c1e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00