Commit Graph

420 Commits

Author SHA1 Message Date
pandamicro 02db3adf58 Fix XMLHttpRequest timeout setter issue 2017-08-07 12:09:42 +08:00
pandamicro 08681a74c4 Merge pull request #739 from pandamicro/v1.6
Fix HttpClient crash during restart
2017-08-04 18:43:08 +08:00
pandamicro 8a025bd6bb Fix HttpClient crash during restart 2017-08-04 18:42:23 +08:00
CocosRobot 2c5cba93f4 [ci skip][AUTO]: updating jsbinding automatically 2017-08-04 10:28:28 +00:00
pandamicro 754e97159a Add BaseJSAction for mac & iOS 2017-08-04 17:51:10 +08:00
knoxHuang a14c83d712 fix Follow isDone error for fireball/issues/6191 2017-08-04 16:06:20 +08:00
pandamicro 677ad5fe81 Secure jsb::Object setObj & getObj when it's empty 2017-08-01 10:04:39 +08:00
pandamicro 0f6515c0a4 Add default alpha channel to cccolor3b_to_jsval conversion 2017-07-31 15:59:52 +08:00
pandamicro 0a2689d4b6 Fix restart crash and reduce restart memory leak 2017-07-28 15:32:25 +08:00
pandamicro 0d1f8339bf Fix ttf config precision issue 2017-07-28 14:20:27 +08:00
pandamicro 30e30a5403 Improve scene cleanup and reduce restart memory leak 2017-07-27 12:01:24 +08:00
pandamicro 35c0dd1993 Fix restart crash issues 2017-07-27 11:10:51 +08:00
pandamicro 0f3f59cfe1 Merge pull request #724 from 2youyou2/develop
should use v140 for 15.0 VisualStudioVersion
2017-07-26 16:35:59 +08:00
2youyouo2 a2d0955bed should use v140 for 15.0 VisualStudioVersion 2017-07-26 16:08:01 +08:00
pandamicro fa1749578b Merge pull request #723 from knoxHuang/develop
fix native call error for fireball/issues/6113
2017-07-26 14:12:46 +08:00
knoxHuang 7e70a8f7d5 fix native call error for fireball/issues/6113 2017-07-26 14:00:37 +08:00
pandamicro d726489d94 Fix JS promise support 2017-07-25 18:03:57 +08:00
pandamicro 7b7ab9f5c4 Temp solution to Promise crash 2017-07-24 18:24:15 +08:00
pandamicro 63264bf21d Fix jsval_to_long issue (not compatible anymore with string value) 2017-07-24 15:08:03 +08:00
pandamicro f35d7c8246 Replace JSString with JS::RootedString 2017-07-24 15:06:50 +08:00
pandamicro f0a6acc6c5 Fix callFunc creation issue with primitive data parameter 2017-07-22 14:29:00 +08:00
Wang Nan 023cefe126 Merge pull request #717 from dumganhar/fix/srwebsocket
Fix potential crash after WebSocket.close and send onclose event after onerror is received
2017-07-20 17:43:20 +08:00
James Chen 68be4dbbaf Fix potential crash after WebSocket.close.
Since the finalize function will get a invalid pointer of WebSocket, invoking ws->closeAysnc() will generate unknown result, probably crash.
HOW TO FIX:
WebSocket and JSB_WebSocketDelegate inhert from Ref. After websocket is initialized successfully, retain websocket instance and delegate, they will both have 2 reference count.
release their reference both in onClose callback and finalize function. The reason is that the order of invoking onClose and finalize function will be unpredictable, ref count technique help to handle this.

Another fix is sending onclose event after onerror is received.
2017-07-20 16:43:24 +08:00
pandamicro d67ef36f36 Merge pull request #714 from pandamicro/develop
Improve iOS project in templates
2017-07-19 18:07:59 +08:00
pandamicro 7ac7251fee Change iOS deployment target to iOS8 2017-07-19 17:49:27 +08:00
knoxHuang 1779f7a585 fix evalString error for fireball/issues/6062 2017-07-19 13:10:42 +08:00
knoxHuang ae7232bf63 fix evalString error for fireball/issues/6062 2017-07-19 12:00:50 +08:00
knoxHuang dfb9e9fa9d fix js_cocos2dx_TMXTiledMap_getPropertiesForGID error for fireball/issues/6035 2017-07-14 15:15:24 +08:00
Wang Nan 66e67e84de Merge pull request #707 from 2youyou2/physics
fixed some physics jsb bugs
2017-07-13 09:40:10 +08:00
2youyouo2 e76f7837e3 fixed some physics jsb bugs 2017-07-12 17:36:53 +08:00
pandamicro 3f535277b6 Merge pull request #705 from pandamicro/develop
Avoid restart crash in spidermonkey
2017-07-11 18:34:33 +08:00
pandamicro 856de64714 Avoid restart crash in spidermonkey 2017-07-11 18:33:39 +08:00
pandamicro 9234bdf0bc Merge pull request #704 from pandamicro/develop
Small fixes
2017-07-11 15:36:37 +08:00
pandamicro cbe4dc6f6d Fix java oc reflection issue 2017-07-11 15:35:31 +08:00
pandamicro 869ee6c185 fix vs 2017 compilation issue with spidermonkey 2017-07-11 00:52:37 +08:00
pandamicro d32214f0d2 Fix simulator crash during app close 2017-07-10 18:30:55 +08:00
pandamicro 144c49a6d7 Fix js oc reflection issue 2017-07-10 18:30:33 +08:00
pandamicro 9765d2d039 Fix win32 simulator issue 2017-07-10 14:26:50 +08:00
pandamicro 22109f8e8d Fix gc crash during app closing 2017-07-09 14:34:02 +08:00
pandamicro 66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
James Chen 1ba17074d1 Uses SocketRocket to implement WebSocket for iOS. It has the following benefits:
1. The API of SocketRocket is easy for use, it's all asynchronous API.
2. No need to deal with thread communications, it's wrapped inside SocketRocket.
3. Network status change will not make connection closed, it just seems there isn't any status change.
4. Locking screen will trigger an error while libwebsockets or bsd socket will not.
5. Don't depend on openssl library which is a little big.
6. Don't need to use a local CA root certificate (curl ca file is over 2MB) for wss connection
7. Don't trigger signal pipe while closing wss connection
8. Easy to integrate SocketRocket to current WebSocket implementation
2017-07-05 16:32:57 +08:00
CocosRobot 2ed9b31229 [ci skip][AUTO]: updating jsbinding automatically 2017-06-30 10:55:09 +00:00
pandamicro f94fd18256 Use PersistentScript in ScriptingCore 2017-06-30 18:02:08 +08:00
pandamicro ba23e966a7 Fix ScriptingCore::cleanup crash 2017-06-30 18:02:08 +08:00
pandamicro cdf2b39412 Remove js_get_type_from_native usage as many as possible 2017-06-30 18:02:08 +08:00
pandamicro dbd7367971 CameraNode auto bindings 2017-06-30 18:02:06 +08:00
pandamicro 32f9c7dc1f Remove debugger 2017-06-30 18:02:05 +08:00
pandamicro 0768865461 Fix non ref finalize crash during app close 2017-06-30 18:02:05 +08:00
pandamicro 7974e6f7af Use pure js event instead of native event 2017-06-30 18:02:05 +08:00
pandamicro 4e5886c8a1 Add build id for jsc files 2017-06-30 18:02:05 +08:00