Commit Graph

4804 Commits

Author SHA1 Message Date
pandamicro 35c0dd1993 Fix restart crash issues 2017-07-27 11:10:51 +08:00
pandamicro e9cbd371df Merge pull request #725 from 2youyou2/develop
update external version
2017-07-26 16:47:31 +08:00
2youyouo2 32ea7cf355 update external version 2017-07-26 16:43:14 +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
Wang Nan ce2facba86 Merge pull request #722 from zilongshanren/improve-bmfont-atlas-cache
fix bmfont atlas cache strategy
2017-07-26 09:45:17 +08:00
pandamicro 5b89db9a7e Merge pull request #720 from pandamicro/develop
Solution to Promise crash
2017-07-25 18:05:16 +08:00
pandamicro d726489d94 Fix JS promise support 2017-07-25 18:03:57 +08:00
zilongshanren 11a2e68a52 fix bmfont atlas cache strategy 2017-07-25 16:40:24 +08:00
James Chen 91d5444e20 Spidermonkey promise works. 2017-07-25 15:34:14 +08:00
James Chen 64a6d89b19 cleanup 2017-07-25 10:14:32 +08:00
Jare Guo 99df2ea2b4 deprecate engineDir in main.js 2017-07-24 20:39:44 +08:00
pandamicro 7b7ab9f5c4 Temp solution to Promise crash 2017-07-24 18:24:15 +08:00
pandamicro 11110c07e0 Fix anysdk missing bindings 2017-07-24 15:08:28 +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
James Chen b97be2db09 Event's subclass should not be allocated on stack. 2017-07-24 11:47:49 +08:00
James Chen ecbf26e5e4 clear exception in editbox callback. 2017-07-24 11:27:30 +08:00
James Chen 06a18603c0 autohandlescope fix. 2017-07-24 11:20:12 +08:00
pandamicro f0a6acc6c5 Fix callFunc creation issue with primitive data parameter 2017-07-22 14:29:00 +08:00
James Chen 5b7717b95d cleanup. 2017-07-21 17:57:45 +08:00
James Chen 787b9b707f updates Android.mk 2017-07-21 17:55:17 +08:00
James Chen bff5521359 cleanup for android. 2017-07-21 17:53:01 +08:00
James Chen 8d6404a7b4 Invokes ScriptEngine::destroyInstance in the destructor of ScriptingCore. 2017-07-21 17:22:26 +08:00
James Chen d71ab99e4b Fixes read memory which is freed. 2017-07-21 17:21:56 +08:00
James Chen 98301a8cc4 Ref class should not be allocated on stack. 2017-07-21 17:21:26 +08:00
James Chen 94dde6ac0d Ref class should not be allocated on stack. 2017-07-21 16:21:48 +08:00
James Chen d72726cf77 chakracore cleanup 2017-07-21 15:34:52 +08:00
James Chen 73c318d105 memory leak fix in CCTextureCache::addImageAsync. 2017-07-21 15:22:09 +08:00
James Chen 6211b28b9a cleanup 2017-07-21 14:59:10 +08:00
James Chen 99529069c4 cleanup and restartVM works. 2017-07-21 14:56:48 +08:00
James Chen c315a58659 cleanup 2017-07-21 14:24:56 +08:00
James Chen a470a31f28 cleanup for jsc. 2017-07-21 13:54:41 +08:00
James Chen 900d04d5af SocketIO memory leak while connecting to an invalid server url. 2017-07-21 11:50:29 +08:00
James Chen a3195fe6f5 memory leak fix. 2017-07-21 11:14:13 +08:00
James Chen d187d23998 updates bindings-generator 2017-07-20 17:53:02 +08:00
James Chen e5edd5d6cf cleanup. 2017-07-20 17:50:40 +08:00
James Chen ceaf5a1ed0 cleanup 2017-07-20 17:49:56 +08:00
James Chen 06bdbf4560 Uses SocketRocket for iOS & macOS. 2017-07-20 17:49:32 +08:00
James Chen b85d9d5f6d remove all js object references in Scene::cleanup 2017-07-20 17:48:51 +08:00
James Chen b0b5edf8a8 Remove unneeded addRef. 2017-07-20 17:48:20 +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 5aa4d68cab updates external 2017-07-20 16:44:59 +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 5889f6f0fa Merge pull request #716 from pandamicro/develop
Fix reverted modifications during merge
2017-07-20 15:23:33 +08:00
pandamicro bd6c45abf2 Fix reverted modifications during merge 2017-07-20 15:22:52 +08:00
Wang Nan f2b5cbe8cf Merge pull request #712 from dumganhar/fix/sync-x-audio-ios
Sync bug fix: Fix AudioEngine thread concurrency crash
2017-07-20 10:11:08 +08:00
pandamicro 93539682a9 Merge pull request #715 from pandamicro/develop
Fix reversed code
2017-07-19 18:09:45 +08:00