Commit Graph

1326 Commits

Author SHA1 Message Date
pandamicro ff4ca61919 Fix anysdk restart issue with old listeners 2017-08-07 16:51:09 +08:00
pandamicro 0bd1c81d80 Fix RootedObject on stack being deallocated after ScriptingCore::cleanup 2017-08-07 14:37:17 +08:00
pandamicro 02db3adf58 Fix XMLHttpRequest timeout setter issue 2017-08-07 12:09:42 +08:00
CocosRobot 5e085a607a [AUTO][ci skip]: updating cocos2dx_files.json 2017-08-04 10:47:32 +00: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 5f1f2d1b29 Let travis work for 1.6 2017-08-04 18:25:51 +08:00
Nan Wang 044ef56c95 Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into v1.6 2017-08-04 18:24:36 +08:00
Nan Wang 9801615b91 update travis config 2017-08-04 18:24:20 +08: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
Wang Nan 35913812a9 Merge pull request #734 from 2youyou2/v1.6
fixed mask in camera
2017-08-03 15:57:10 +08:00
2youyouo2 469f9a9ab8 fixed mask in camera 2017-08-03 14:39:43 +08:00
pandamicro b39dba1c63 Fix simulator restart crash issue 2017-08-02 18:14:29 +08:00
pandamicro d5792dc1c7 Fix anysdk PluginParam finalize issue 2017-08-02 17:55:56 +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 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
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
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 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
pandamicro a3039798cf Fix reversed code 2017-07-19 18:09:15 +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 2c7e127539 Rearrange anysdk files in iOS project 2017-07-19 17:59:54 +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