Commit Graph

4804 Commits

Author SHA1 Message Date
Cocos Robot 9e3e1ce231 Sync branch v2.1.3 to v2.2.0 2019-08-21 15:27:04 +08:00
PP 2ff511ac8c fix composed character on EditBox (#1798) 2019-08-21 11:41:53 +08:00
Jare Guo f3762dda2c Merge commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0' into v2.2.0-release
* commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0':
  Refine native particle logic (#1796)
2019-08-19 14:54:09 +08:00
owen 7ca500bba1 Fix model batcher crash issue (#1797) 2019-08-19 14:49:09 +08:00
owen 3ec0e1986f Refine native particle logic (#1796) 2019-08-19 14:43:41 +08:00
minggo eb67111bbb fix potential overflow (#1795) 2019-08-13 17:59:45 +08:00
minggo ced9217248 update template json file (#1793) 2019-08-08 17:41:52 +08:00
owen fa08bab7ae Fix native tiled layer user node not render bug (#1792) 2019-08-08 16:25:47 +08:00
owen 41c215da54 Fix frame buffer crash bug (#1791)
* Fix frame buffer crash bug

* Fix potential color buffer crash
2019-08-08 10:17:49 +08:00
Jare Guo 7f993557c2 Merge develp into v2.2.0
* commit '99bec00fd5a12f9779ee17237bea2435a285b187':
  prevent downloader callbacks when app exits (#1751)
  fix memory leak in loading font on iOS/mac (#1752)
  Copy-paste mistake fix in handling GL_COMMAND_UNIFORM_4FV (#1760)
  add okio-1.15.0.jar (#1750)
  fix bad suggestion (#1747)
  Replace Android HttpClient with OkHttp (#1731)
  WebView add background transparent (#1727)
  ios build fail bug fix  + https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-08-06 21:09:47 +08:00
owen 6b4e452608 fix windows spine compile error (#1790) 2019-08-05 09:38:27 +08:00
Cocos Robot 99bec00fd5 Sync branch v2.2.0 to develop 2019-08-02 18:17:55 +08:00
minggo 1e37ff1ec4 synchronize v2.1.3 to 2.2 2019-08-02 18:07:50 +08:00
cary 7576a53822 Fixed memory leak caused by HtmlCanvasElement not being released. (#1786)
* Fixed memory leak caused by HtmlCanvasElement not being released.

* modify unroot

* add comment
2019-08-02 10:21:48 +08:00
unace ca5c7fd25b [Android] fix an audio bug (#1788)
*  fix external player muting. add audio focus flag

Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.

* [Android] fix an audio bug

fix an audio bug that audios are not paused when locking screen while notification drawer is showing.
2019-08-02 09:25:11 +08:00
cary 9218ca722b Fix the error of camera pos in program. (#1787)
* Fix a few details.

* fix camera pos error
2019-08-01 01:09:22 +08:00
unace 919d036a95 fix external player muting. add audio focus flag (#1785)
Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.
2019-07-31 15:06:11 +08:00
cary e2be1c5f51 Fix memory leak of Label on win32 platform. (#1783)
* Fix memory leak of Label on win32 platform.

* add free dataBuf.

* format
2019-07-31 15:05:47 +08:00
PP 575c15bbed set default text color for editText (#1778) 2019-07-31 15:05:37 +08:00
2youyouo2 acda7cbfc6 change cc_mat3WorldIT to cc_matWorldIT 2019-07-30 15:38:46 +08:00
knox 48250287ee refine code 2019-07-29 09:20:11 +08:00
knox 7f68a97cda improve getCurrentLanguage to android 2019-07-26 16:45:31 +08:00
2youyouo2 1bfcda6c19 update jsbinding 2019-07-26 16:40:46 +08:00
2youyouo2 4f0c6c344d refine code 2019-07-26 16:04:37 +08:00
Jare Guo 602804cd61 Merge pull request #1782 from minggo/v2.1.3
升级 v8
2019-07-26 13:39:16 +08:00
minggo ebc27bb630 Merge branch 'v2.1.3' of github.com:minggo/cocos2d-x-lite into v2.1.3 2019-07-26 12:00:05 +08:00
minggo 7fbe83c3ee use jsc on iOS 2019-07-26 11:49:43 +08:00
minggo b76f9b27a2 correct coping files for default template 2019-07-26 11:44:36 +08:00
minggo 57fd102dd5 fix compling error on android x86 2019-07-26 11:34:57 +08:00
2youyouo2 08a678cc1f refine model, avoid joint string 2019-07-26 10:55:04 +08:00
2youyouo2 178ab5efc1 Merge remote-tracking branch 'origin/v2.2.0' into v2.3.0 2019-07-26 10:54:20 +08:00
2youyouo2 8903b6031f change uniform key to hash 2019-07-25 17:55:19 +08:00
2youyouo2 1e58a98587 refine code 2019-07-25 15:14:00 +08:00
2youyouo2 f358a577fb refine state 2019-07-25 11:40:07 +08:00
Jare Guo b3f4c1e979 Revert "Update v8 to 7.5.288.22 (#1772)" (#1779)
This reverts commit 144bb78337.
2019-07-25 10:20:55 +08:00
2youyouo2 7fdedbf9c5 change std::unordered_map<std::string, xx> to std::unordered_map<size_t, xx> 2019-07-24 17:51:43 +08:00
cary 88dd29cbb4 fix shadow error of 3d-model. (#1777)
* fix shadow error of 3d-model.

* add node judgement
2019-07-24 15:26:12 +08:00
2youyouo2 4760a70f56 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0 2019-07-22 10:39:05 +08:00
2youyouo2 a660199412 Merge remote-tracking branch 'origin/v2.3.0' into v2.3.0 2019-07-22 10:27:03 +08:00
minggo 66735ce3c8 fix issue that label is blurred on iOS/mac os (#1775) 2019-07-20 15:21:07 +08:00
minggo 144bb78337 Update v8 to 7.5.288.22 (#1772)
* ios use v8

* make v8 work on iOS

* fix compiling error

* can build and run on android, but will crash

* use jsc for non arm64 devices and some other fix

* make macro more clear

* fix errors on windows
2019-07-20 14:59:04 +08:00
owen 75fbdd455f Merge commit 'd3bb1da7bbf873dfe366a9d9bc0ed419b67b3bb9' into v2.3.0-fix-dragonbones-axis 2019-07-18 21:45:25 +08:00
2youyouo2 d3bb1da7bb fixed android build 2019-07-18 17:22:39 +08:00
owen 5ed6f54b13 fix skeletondatamgr android compile error 2019-07-18 16:19:34 +08:00
owen 8fc2a40d1a Fix dragonbones y axis error 2019-07-18 16:19:19 +08:00
caryliu ebc6071ac1 delete mediump and lowp on mac. 2019-07-18 12:21:18 +08:00
2youyouo2 aa4e89aa7b fixed native shader definition 2019-07-18 11:22:03 +08:00
caryliu d623ac7e65 fix program error on mac 2019-07-17 18:57:49 +08:00
caryliu ff17a83ee0 Support skin-mesh-render and fix some bugs. 2019-07-17 16:01:38 +08:00
Cocos Robot 673e7621ad Sync branch v2.3.0 to develop 2019-07-17 14:31:06 +08:00