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

23 Commits

Author SHA1 Message Date
mogemimi 5b8919829c Fix typos in local variables (#16712) 2016-10-20 18:17:37 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
 2016-06-15 15:01:26 +08:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 2016-05-25 19:19:27 +08:00
pandamicro a03c45ce62 Update network licenses and reformat 2016-05-18 14:29:54 +08:00
minggo 776ee8ac5a Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces 
fix iOS downloader crash when storage path contains spaces
 2016-04-19 13:46:02 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Ce Zheng 963efe78fe fix iOS downloader crash when storage path contains spaces 2016-01-07 16:58:16 +09:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
pandamicro 58902f0711 Fix issue in URLSession:task:didCompleteWithError: 2015-12-16 21:19:46 +08:00
pandamicro ffcf45ef78 Improved solution for Downloader status code issue on iOS 9 2015-12-16 17:45:40 +08:00
pandamicro 7303895866 Improve error message for Downloader and add test case 2015-12-16 15:43:18 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
Ce Zheng 6d58fc05d9 Fix Downloader callback bug on iOS9 
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
 2015-12-15 13:16:24 +09:00
pandamicro 91909081da Merge pull request #14542 from pandemosth/issue_14539 
Fix for Issue 14539
 2015-12-03 18:47:17 +08:00
Pan Demosthenous ef931b61af correct typo in method name of doDestroy 2015-12-02 15:23:05 +11:00
Pan Demosthenous 528a94d36f fixes a crash in destructor of CCDownloader-apple when completing a data download 2015-12-02 15:21:42 +11:00
Pan Demosthenous 151e7a7a53 CCDownloader-apple : call onTaskFinish when the download session completes for a data task 2015-12-02 15:16:00 +11:00
Ce Zheng ecf94a3dc4 Add a buffer queue to iOS Downloader 
Upon calling NSURLSessionDownloadTask's resume, the task's timeout
countdown starts. When the AssetManagerEx starts downloading, it creates
all the tasks all at once and just `resume` upon creation. When the
number of asset files is very large, later tasks tend to end up in
'request timed out -1001' error before they can even start downloading.
This commit adds a buffer queue to prevent all the NSURLSessionTasks to
start all at once.
 2015-12-01 17:24:26 +09:00
Vincent Yang 9b4fe5b5a1 Add CCDownloader-android class frame to android project. 2015-09-07 11:55:00 +08:00
Vincent Yang 3a078540a0 Modify CCDownloader-apple.mm support continuly download. 2015-09-07 10:08:28 +08:00
Vincent Yang ea580ed2ee Restructure CCDownload Interface and implements with curl. 2015-09-02 18:26:42 +08:00
Vincent Yang cf664800ac refine #22483 : Restructure CCDownload Interface and implements on iOS. 2015-08-28 16:40:11 +08:00
Vincent Yang b4f585732e Add CCDownloader-apple for mac and ios. 2015-08-20 11:35:40 +08:00