Commit Graph

16 Commits

Author SHA1 Message Date
James Chen 779cc28217 Sync from https://github.com/cocos2d/cocos2d-x/pull/17381 2017-02-20 10:46:28 +08:00
James Chen a9b35750cf Updates JSBindings to support pass a CA file through ‘new WebSocket(url, [protocols], caFilePath)’ API. 2017-02-16 11:15:45 +08:00
pandamicro 1da6a0e5ae Revert Network modifications 2017-02-06 12:37:44 +08:00
pandamicro cec9760bd0 Fix websocket cycling destructor issue 2017-01-22 18:43:32 +08:00
pandamicro c47a770877 Adapt websocket to new memory model 2017-01-06 16:59:40 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
pandamicro f05b67e287 Upgrade cocos/scripting to v3.13 2016-08-09 18:17:42 +08:00
Wenhai Lin cdbd28ce43 [JSB]Fixed crash when WebSocket is closed. 2016-04-27 13:54:25 +08:00
Wenhai Lin a50b000b17 Fixed memory leak and warns 2016-04-21 23:47:26 +08:00
Wenhai Lin 83fc6fd1a8 Bug fix:
1.Fixed crash in win for rich text
2.Fixed crash when custom SSL certificate is set on iOS
3.Fixed SocketIO crash on reconnect
4.Fixed ActionManager memory leak
5.Fixed crash in MenuItem::activate
6.Fixed crash on exit game
7.Fixed crash in TableView::updateCellAtIndex
8.Fixed crash in RichText on window
2016-04-21 15:19:47 +08:00
Wenhai Lin 7399218a5e Close web socket on exit may cause crash. 2016-04-11 15:52:40 +08:00
Wenhai Lin e4b8db424a Withespaces does matter. 2016-04-07 21:56:30 +08:00
Wenhai Lin b3a6312d88 Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener 2016-04-07 16:22:53 +08:00
Wenhai Lin 0e7cb5da16 no more uthash 2016-04-07 11:33:04 +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