Commit Graph

1784 Commits

Author SHA1 Message Date
pandamicro b314eecc37 Merge pull request #744 from pandamicro/v1.6
Fix anysdk restart issue with old listeners
2017-08-07 18:02:43 +08:00
pandamicro 84af83b722 Merge pull request #743 from pandamicro/v1.6
Fix RootedObject on stack being deallocated after ScriptingCore::cleanup
2017-08-07 17:40:19 +08:00
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 bd2abf49ae Merge pull request #742 from pandamicro/v1.6
Fix XMLHttpRequest timeout setter issue
2017-08-07 12:10:34 +08:00
pandamicro 02db3adf58 Fix XMLHttpRequest timeout setter issue 2017-08-07 12:09:42 +08:00
pandamicro e0f405c2e5 Merge pull request #740 from CocosRobot/update_cocosfiles_1501843652
[AUTO][ci skip]: updating cocos2dx_files.json
2017-08-05 01:22:34 +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
pandamicro 9ff6e6db39 Merge pull request #737 from CocosRobot/update_js_bindings_1501842444
[ci skip][AUTO]: updating jsbinding automatically
2017-08-04 18:30:54 +08:00
CocosRobot 2c5cba93f4 [ci skip][AUTO]: updating jsbinding automatically 2017-08-04 10:28:28 +00:00
pandamicro 35caced7c7 Merge pull request #736 from pandamicro/v1.6
Let travis work for 1.6
2017-08-04 18:26:27 +08: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 d6b2782dc9 Merge pull request #735 from knoxHuang/v1.6
fix Follow isDone error for fireball/issues/6191
2017-08-04 17:58:27 +08:00
Knox db8b2836d2 Merge pull request #1 from pandamicro/v1.6
Add BaseJSAction for mac & iOS
2017-08-04 17:54:46 +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 1a913ffcf5 Merge pull request #733 from pandamicro/develop
Fix simulator restart crash issue
2017-08-02 18:19:26 +08:00
pandamicro b39dba1c63 Fix simulator restart crash issue 2017-08-02 18:14:29 +08:00
pandamicro b5115c96d9 Merge pull request #732 from pandamicro/develop
Fix anysdk PluginParam finalize issue
2017-08-02 17:57:54 +08:00
pandamicro d5792dc1c7 Fix anysdk PluginParam finalize issue 2017-08-02 17:55:56 +08:00
pandamicro 0ac0aac4b2 Merge pull request #731 from pandamicro/develop
Secure jsb::Object setObj & getObj when it's empty
2017-08-01 10:05:26 +08:00
pandamicro 677ad5fe81 Secure jsb::Object setObj & getObj when it's empty 2017-08-01 10:04:39 +08:00
pandamicro cde351daf0 Merge pull request #730 from pandamicro/develop
Add default alpha channel to cccolor3b_to_jsval conversion
2017-07-31 16:00:29 +08:00
pandamicro 0f6515c0a4 Add default alpha channel to cccolor3b_to_jsval conversion 2017-07-31 15:59:52 +08:00
pandamicro 58badcfc88 Merge pull request #729 from pandamicro/develop
Fix restart crash and reduce restart memory leak
2017-07-28 15:43:46 +08:00
pandamicro 0a2689d4b6 Fix restart crash and reduce restart memory leak 2017-07-28 15:32:25 +08:00
pandamicro c3dae11d7f Merge pull request #728 from pandamicro/develop
Fix ttf config precision issue
2017-07-28 14:22:49 +08:00
pandamicro 0d1f8339bf Fix ttf config precision issue 2017-07-28 14:20:27 +08:00
pandamicro 1158723694 Merge pull request #727 from pandamicro/develop
Improve scene cleanup and reduce restart memory leak
2017-07-27 12:01:56 +08:00
pandamicro 30e30a5403 Improve scene cleanup and reduce restart memory leak 2017-07-27 12:01:24 +08:00
pandamicro 11d7eb16a4 Merge pull request #726 from pandamicro/develop
Fix restart crash issues
2017-07-27 11:11:36 +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
Wang Nan 30ae97336b Merge pull request #721 from jareguo/develop
deprecate engineDir in main.js
2017-07-25 09:52:54 +08:00
Jare Guo 99df2ea2b4 deprecate engineDir in main.js 2017-07-24 20:39:44 +08:00