Commit Graph

10 Commits

Author SHA1 Message Date
James Chen 412f71a89b [android] Fixes wrong timeout value is used. Should use timeout parameter per requrest instead of per client instance. (#1014) 2017-11-28 13:42:01 +08:00
James Chen 53e07c1da7 Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0 2017-09-07 18:32:24 +08:00
James Chen 703e857352 Synchronize network changes from cocos2d-x. 2017-08-30 13:56:41 +08:00
James Chen 675df73533 update HttpClient-android.cpp 2017-08-10 16:55:12 +08:00
pandamicro bcbc4e1131 Upgrade cocos/math & cocos/network to v3.13 2016-08-05 18:13:16 +08:00
Wenhai Lin 14d3fc1fdb Fixed crash 2016-05-20 11:52:13 +08:00
pandamicro cac05f6128 Add AssetsManagerEx to extension 2016-05-18 15:21:56 +08:00
Wenhai Lin 5dcd5ed979 Use const references whenever possible 2016-05-18 14:26:43 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00