14 Commits

Author	SHA1	Message	Date
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
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
James Chen	9f793f8a9b	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +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
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	fa7c97171b	fix some warnings	2013-12-06 16:32:06 +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
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