Commit Graph

18 Commits

Author SHA1 Message Date
minggo 5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
Markmark@gamekon.com a6093a6f1c Throw args away rather than raising an error. (#1198)
Throw args away rather than raising an error.
2018-04-25 13:40:03 +08:00
minggo 0d483a9b07 add back network (#1141)
* add back network

* add network back on windows
2018-03-09 16:20:48 +08:00
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
James Chen 380b27b02c fixed #1031: Potential Crash in JSB_WebSocketDelegate::onClose (#1103) 2018-02-09 12:53:29 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen ccacdafb23 Fixes assertion while websocket instance is garbage collected. 2017-10-21 19:47:15 +08:00
James Chen c821a5cc90 More safe checks in jsb_websockets.cpp 2017-10-12 11:17:48 +08:00
James Chen 17a97d0aff fixed #839: Adds event.target for websocket callback. 2017-09-25 11:54:20 +08:00
James Chen 73e45e92e4 Adds MappingUtils file, box2d works again. 2017-08-18 14:34:55 +08:00
James Chen e51e4d51bb websocket text response fix and update v8 2017-08-09 16:11:23 +08:00
James Chen dcadda2862 defineFinalizedFunction -> defineFinalizeFunction. 2017-08-03 17:28:40 +08:00
James Chen f80802f97e more se::HandleObject use. 2017-07-31 16:18:01 +08:00
James Chen 854aa81c0d JSB_PRECONDITION2->SE_PRECONDITION2 2017-07-31 10:57:59 +08:00
James Chen 10710cc407 switchToRoot -> root, switchToUnroot -> unroot. 2017-07-31 10:39:32 +08:00
James Chen ceaf5a1ed0 cleanup 2017-07-20 17:49:56 +08:00
James Chen 2808497a88 clearException after manually registration. 2017-07-11 13:40:04 +08:00
James Chen b8c1493850 socketio bindings ok, and fix some bugs of socketio. 2017-07-10 16:40:33 +08:00