19 Commits

Author	SHA1	Message	Date
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
mogemimi	d1871d1ca7	Refactor HttpRequest and HttpResponse	2016-04-19 02:58:42 +09:00
mogemimi	41dd44c75d	Fix some typos in docs	2016-01-11 19:23:05 +09:00
mogemimi	9df30d2454	Fix typos in documentation	2015-10-23 16:59:51 +09:00
mogemimi	5993304e06	Fix typos	2015-10-09 17:59:11 +09:00
linshun	2a02510a9c	issue #12078: Added network group.	2015-05-28 15:46:36 +08:00
samuele3hu	e0bde0f789	Update comments of some header files	2015-03-26 22:07:44 +08:00
samuele3hu	31b34ddf77	Update comments of some header files	2015-03-19 16:45:53 +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
samuele3hu	ada7fa23d3	Add CC_DLL for related network files	2014-08-22 13:42:46 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
minggo	07600bd46b	network -> cocos2d::network	2014-01-02 16:25:35 +08:00
minggo	1e9c763b40	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +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