Dale Stammen
|
548fc94eb8
|
added missing std includes
|
2015-10-02 18:17:11 -07:00 |
Chris Hannon
|
bd7f90f993
|
adds initializing value and corrects spelling of variable _endpointseparator
Signed-off-by: Chris Hannon <chris@channon.us>
|
2015-09-19 20:47:54 -04:00 |
Chris Hannon
|
e7c2436d85
|
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
Signed-off-by: Chris Hannon <chris@channon.us>
|
2015-09-19 20:31:48 -04:00 |
Vincent Yang
|
5eafc93d86
|
Remove AssetsManager dependence with CRUL.
|
2015-09-17 16:52:31 +08:00 |
Vincent Yang
|
ea585f4b7d
|
Fix compile problems.
|
2015-09-16 09:34:24 +08:00 |
Vincent Yang
|
848fa2c0d0
|
Merge cocos2d.
|
2015-09-15 18:30:45 +08:00 |
Vincent Yang
|
bf477c6bfb
|
Restructure AssetsManagerEx.
|
2015-09-15 11:23:46 +08:00 |
Vincent Yang
|
ebf308d88c
|
Test case Downloader Test restructured.
|
2015-09-14 15:33:34 +08:00 |
Vincent Yang
|
bd80eb6f46
|
CCDownloader-android implements Data Task Download.
|
2015-09-10 18:03:15 +08:00 |
Vincent Yang
|
7e2fe05050
|
CCDownloader-android implements File Task Download.
|
2015-09-10 15:56:06 +08:00 |
pandamicro
|
941cd3c9de
|
Merge pull request #13717 from jianglong0156/assetsmanagerContinue
fix the AssetsManagerEx can not continuous transmission
|
2015-09-10 11:34:03 +08:00 |
江龙
|
d6934cfc4b
|
rename var resumeDownloaded to resumeDownloaded.
|
2015-09-08 16:38:02 +08:00 |
江龙
|
8daf026c6c
|
fix the AssetsManagerEx can not continuous transmission for large zip file.
the testcase is extension/assetsmanager
|
2015-09-08 16:34:02 +08:00 |
minggo
|
bbe5861367
|
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
|
2015-09-08 10:26:37 +08: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
|
0afa2bdfc6
|
Modify CCDownloader-curl.cpp to support continue download.
|
2015-09-06 15:57:51 +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 |
pandamicro
|
055ef23931
|
Fix AssetsManager crash by protecting Downloader with shared_ptr
|
2015-08-22 22:13:53 +08:00 |
jianglong0156
|
895c29efe4
|
fix texturecache didn't show correctly in win32
|
2015-08-20 18:11:05 +08:00 |
Vincent Yang
|
b4f585732e
|
Add CCDownloader-apple for mac and ios.
|
2015-08-20 11:35:40 +08:00 |
Ricardo Quesada
|
5baa90c79e
|
libcurl.h not included in the header to avoid...
too many dependencies
|
2015-08-13 19:28:38 -07:00 |
Ricardo Quesada
|
d2cf4bfc79
|
Squashed commit of the following:
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
|
2015-08-13 00:14:10 -07:00 |
子龙山人
|
47fe470647
|
Merge pull request #13213 from jianglong0156/improUtfFunction
add api getStringUTFCharsJNI newStringUTFJNI
|
2015-08-05 17:26:52 +08:00 |
jianglong0156
|
fac7a78fc8
|
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
|
2015-08-05 16:10:14 +08:00 |
pandamicro
|
8cdcade07a
|
Merge pull request #13186 from jianglong0156/addEmotionTest
fix getStringUTFChars bug
|
2015-08-05 10:19:19 +08:00 |
jianglong0156
|
3230ca154d
|
improve the code. fix network error
|
2015-08-04 16:42:16 +08:00 |
jianglong0156
|
00b7e98c89
|
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
|
2015-08-04 16:24:08 +08:00 |
jianglong0156
|
979700e343
|
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
|
2015-08-04 11:30:30 +08:00 |
pandamicro
|
f10994c20b
|
Merge pull request #12467 from MagicTavern/v3_fix_websocket
fix a problem where WebSocket messages may pile up
|
2015-08-03 16:25:56 +08:00 |
fusijie
|
2c5e2db6b4
|
refine NSLog in HttpAsynConnection in release mode.
|
2015-07-17 14:23:51 +08:00 |
andyque
|
7243f2cff5
|
add const & to string arguments
|
2015-07-09 11:23:20 +08:00 |
andyque
|
d4066a5ff8
|
improve coding style of Socket.IO
|
2015-07-08 17:23:48 +08:00 |
子龙山人
|
155ac8c07e
|
Merge pull request #11583 from hannon235/v3-update-sio
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
|
2015-07-08 16:11:05 +08:00 |
Zhou Yuntao
|
507f221483
|
fix a problem where WebSocket messages will pile up if server sends them faster than client's frame rate
|
2015-06-22 20:58:37 +08:00 |
pandamicro
|
5ee22c4142
|
Merge pull request #12174 from pajeroquan/v3
Fix JNI object memory leak!
|
2015-06-17 15:14:36 +08:00 |
pandamicro
|
d0db40c4a6
|
Merge pull request #12080 from linshun/v3
issue #12078 added audio, network, physics, platform and storage group.
|
2015-06-15 12:45:11 +08:00 |
pandamicro
|
fa71a6e352
|
Merge pull request #12204 from jianglong0156/issue1756
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
|
2015-06-05 13:17:53 +08:00 |
jianglong0156
|
8d011fd457
|
formate the space
|
2015-06-05 11:45:05 +08:00 |
pajeroquan
|
956101bb72
|
Fix JNI object memory leak!
Fix JNI object memory leak!
|
2015-06-04 11:54:53 +08:00 |
Chris Hannon
|
574cfb4ade
|
Merge branch 'v3-update-sio' of https://github.com/hannon235/cocos2d-x into merge-up
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
Conflicts:
cocos/network/SocketIO.cpp
|
2015-06-02 21:11:43 -04:00 |
Chris Hannon
|
fe6275adf5
|
[v3-update-sio] fixes nested switch brackets - best practice would be to replace these with functions in the future
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:34 -04:00 |
Chris Hannon
|
6bcf325630
|
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:34 -04:00 |
Chris Hannon
|
5af28838d2
|
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:33 -04:00 |
jianglong0156
|
97d0265e32
|
gzip test
|
2015-06-02 10:23:30 +08:00 |
子龙山人
|
40ea6e3e41
|
Merge pull request #12103 from samuele3hu/v3_http_leak
Fix the memory leak of HttpClient on the iOS/Mac platform.
|
2015-06-02 10:11:03 +08:00 |
samuele3hu
|
ae6cb678c6
|
Fix the memory leak of HttpClient on the iOS/Mac platform.
|
2015-05-29 17:13:49 +08:00 |
Dale Stammen
|
60f672599b
|
added winrt networking files
|
2015-05-28 13:48:13 -07:00 |
linshun
|
2a02510a9c
|
issue #12078: Added network group.
|
2015-05-28 15:46:36 +08:00 |