Code

V2.4.3#851

Code

Closed

13734050753 wants to merge 106 commits intomastercocos/example-projects:masterfrom

v2.4.3cocos/example-projects:v2.4.3Copy head branch name to clipboard

Commits

Commits on Aug 27, 2019

• update meta 2.1.2 to 2.1.3

  knoxHuang

  committed
  22b92a2

  Copy full SHA for 22b92a2

• Merge pull request #751 from knoxHuang/v2.1.3

  Show description for a1890db
  knoxHuang

  authored
  a1890db

  Copy full SHA for a1890db

Commits on Aug 28, 2019

• ban videoPlayer keepRatio (#752)

  

  PPpro

  authored and

  jareguo

  committed
  4abc640

  Copy full SHA for 4abc640

Commits on Aug 30, 2019

• ban editbox case on alipay (#753)

  

  PPpro

  authored and

  jareguo

  committed
  6539810

  Copy full SHA for 6539810

Commits on Sep 2, 2019

• disable mesh example on ie11

  2youyou2

  committed
  74d4dbc

  Copy full SHA for 74d4dbc

• Merge remote-tracking branch 'origin/v2.1.3' into v2.1.3

  Show description for 2a91ed9
  2youyou2

  committed
  2a91ed9

  Copy full SHA for 2a91ed9

Commits on Sep 3, 2019

• Merge pull request #754 from 2youyou2/v2.1.3

  Show description for f0104e6
  knoxHuang

  authored
  f0104e6

  Copy full SHA for f0104e6

• open downloader-web case (#755)

  

  PPpro

  authored and

  jareguo

  committed
  8d427a3

  Copy full SHA for 8d427a3

Commits on Sep 4, 2019

• add id to example cases

  knoxHuang

  committed
  77f37b8

  Copy full SHA for 77f37b8

• Merge pull request #757 from knoxHuang/v2.1.3

  Show description for 8c46a99
  knoxHuang

  authored
  8c46a99

  Copy full SHA for 8c46a99

• Merge commit v2.1.3 into v2.2.0-release

  Show description for 89b452c
  knoxHuang

  committed
  89b452c

  Copy full SHA for 89b452c

• Merge pull request #759 from knoxHuang/v2.2.0-release

  Show description for e773d9c
  jareguo

  authored
  e773d9c

  Copy full SHA for e773d9c

Commits on Sep 6, 2019

• call label default onload on example-case (#760)

  

  PPpro

  authored and

  jareguo

  committed
  d42d08e

  Copy full SHA for d42d08e

Commits on Sep 9, 2019

• add mipmap example

  2youyou2

  committed
  a9dabde

  Copy full SHA for a9dabde

• refine raycast example

  2youyou2

  committed
  1365aca

  Copy full SHA for 1365aca

• add screen-to-world-point example

  2youyou2

  committed
  8951a82

  Copy full SHA for 8951a82

• Merge pull request #761 from 2youyou2/v2.1.3

  Show description for 6b8900a
  knoxHuang

  authored
  6b8900a

  Copy full SHA for 6b8900a

Commits on Sep 10, 2019

• Merge commit '6b8900a5f1019ac05539d11b914929ac61f66ae3' into v2.2.0-release

  Show description for 4d193ee
  knoxHuang

  committed
  4d193ee

  Copy full SHA for 4d193ee

• Merge pull request #762 from knoxHuang/v2.2.0-release

  Show description for 08da85a
  knoxHuang

  authored
  08da85a

  Copy full SHA for 08da85a

• fixed cocos-creator/2d-tasks/issues/1800

  2youyou2

  committed
  a63000d

  Copy full SHA for a63000d

• Merge pull request #763 from 2youyou2/v2.1.3

  Show description for 5371570
  knoxHuang

  authored
  5371570

  Copy full SHA for 5371570

Commits on Sep 11, 2019

• add missing texture

  2youyou2

  committed
  74a0db2

  Copy full SHA for 74a0db2

• Merge pull request #764 from 2youyou2/v2.1.3-release

  Show description for e60c3ca
  knoxHuang

  authored
  e60c3ca

  Copy full SHA for e60c3ca

Commits on Sep 18, 2019

• update meta

  knoxHuang

  committed
  b9fb69a

  Copy full SHA for b9fb69a

• improve Subpackages examples

  knoxHuang

  committed
  a74fc34

  Copy full SHA for a74fc34

• Merge pull request #765 from knoxHuang/v2.1.3-release

  Show description for 01eca90
  knoxHuang

  authored
  01eca90

  Copy full SHA for 01eca90

Commits on Sep 24, 2019

• Merge commit '2.1.4-release' into v2.2.0-release

  Show description for 525b700
  knoxHuang

  committed
  525b700

  Copy full SHA for 525b700

• Merge pull request #766 from knoxHuang/v2.2.0-release

  Show description for ac0cc8f
  jareguo

  authored
  ac0cc8f

  Copy full SHA for ac0cc8f

Commits on Sep 26, 2019

• Fix DragonBones replace skin example offset incorrect (#768)

  

  sunnylanwanjun

  authored and

  jareguo

  committed
  dcbbfe7

  Copy full SHA for dcbbfe7

• fix socket-io plugin on xiaomi platform (#767)

  

  PPpro

  authored and

  jareguo

  committed
  2dc7c99

  Copy full SHA for 2dc7c99

• add dynamic batch mesh renderer example (#769)

  

  2youyou2

  authored and

  jareguo

  committed
  fa81a2e

  Copy full SHA for fa81a2e

• fix tiledmap change scene throw error (#770)

  

  sunnylanwanjun

  authored and

  jareguo

  committed
  a7c48a8

  Copy full SHA for a7c48a8

Commits on Sep 27, 2019

• update button transition in subpackage scene (#771)

  

  PPpro

  authored and

  jareguo

  committed
  64286e7

  Copy full SHA for 64286e7

Commits on Sep 29, 2019

• Adjust structure

  xunyi0

  committed
  363b07e

  Copy full SHA for 363b07e

Commits on Sep 30, 2019

• Merge pull request #772 from xunyi0/v2.2.1

  Show description for 2c4ef75
  knoxHuang

  authored
  2c4ef75

  Copy full SHA for 2c4ef75

• modify folder name of destroy_self

  xunyi0

  committed
  15573b0

  Copy full SHA for 15573b0

• Merge pull request #773 from xunyi0/v2.2.1

  Show description for 68e8ef2
  knoxHuang

  authored
  68e8ef2

  Copy full SHA for 68e8ef2

Commits on Oct 9, 2019

• Add more message for websocket state displaying

  Show description for 4594218
  Marssssssss

  committed
  4594218

  Copy full SHA for 4594218

Commits on Oct 10, 2019

• Richer msgs for xhr states displaying

  Marssssssss

  committed
  8579456

  Copy full SHA for 8579456

• let audio normally download when audio is playing

  Show description for 8f1ec4b
  Marssssssss

  committed
  8f1ec4b

  Copy full SHA for 8f1ec4b

• Merge pull request #774 from Marssssssss/v2.1.4-release

  Show description for 400626f
  knoxHuang

  authored
  400626f

  Copy full SHA for 400626f

• Merge pull request #775 from Marssssssss/v2.1.4-realeasfor1727

  Show description for abfcf2f
  knoxHuang

  authored
  abfcf2f

  Copy full SHA for abfcf2f

Commits on Oct 12, 2019

• fixed capture native

  2youyou2

  committed
  2e7010a

  Copy full SHA for 2e7010a

• fix wrong jump height in case platform

  Marssssssss

  committed
  c7a9ce5

  Copy full SHA for c7a9ce5

• Merge pull request #777 from 2youyou2/v2.2.0-release-capture-native

  Show description for d3623f0
  knoxHuang

  authored
  d3623f0

  Copy full SHA for d3623f0

• Merge pull request #778 from Marssssssss/v2.1.4-release

  Show description for db056f6
  knoxHuang

  authored
  db056f6

  Copy full SHA for db056f6

• Merge remote-tracking branch 'fireball/v2.1.4-release' into v2.2.0-release

  jareguo

  committed
  fd7e3b4

  Copy full SHA for fd7e3b4

Commits on Oct 14, 2019

• add shader example-cases (#779)

  

  zhefengzhang

  authored and

  knoxHuang

  committed
  1904898

  Copy full SHA for 1904898

• Add ios access to Native_Call (#780)

  

  Marssssssss

  authored and

  knoxHuang

  committed
  78148e2

  Copy full SHA for 78148e2

Commits on Oct 16, 2019

• MotionStreak scene optimize (#781)

  Show description for db04cd6
  

  zhefengzhang

  authored and

  knoxHuang

  committed
  db04cd6

  Copy full SHA for db04cd6

Commits on Oct 17, 2019

• add VideoPlayer StayOnBottom example (#782)

  knoxHuang

  authored
  f1744f7

  Copy full SHA for f1744f7

Commits on Oct 18, 2019

• 02_particle scenes optimize (#783)

  Show description for 1128bac
  

  zhefengzhang

  authored and

  knoxHuang

  committed
  1128bac

  Copy full SHA for 1128bac

Commits on Oct 21, 2019

• update 3d examples (#784)

  Show description for d02f0bb
  

  2youyou2

  authored and

  knoxHuang

  committed
  d02f0bb

  Copy full SHA for d02f0bb

Commits on Oct 25, 2019

• fix md5 url for wssCacert (#787)

  

  PPpro

  authored and

  jareguo

  committed
  d153df2

  Copy full SHA for d153df2

• set io as global var in socket-io (#786)

  

  PPpro

  authored and

  jareguo

  committed
  18acd87

  Copy full SHA for 18acd87

Commits on Oct 26, 2019

• Reduce the speed of sprite Filled change (#788)

  

  zhefengzhang

  authored and

  jareguo

  committed
  814feab

  Copy full SHA for 814feab

Commits on Nov 8, 2019

• fixed #783pr error commit (#790)

  

  zhefengzhang

  authored and

  knoxHuang

  committed
  a330593

  Copy full SHA for a330593

Commits on Nov 11, 2019

• move template for updated jsb template (#791)

  

  wuzhiming

  authored and

  knoxHuang

  committed
  9f56645

  Copy full SHA for 9f56645

Commits on Nov 15, 2019

• Merge commit 'v2.1.4-release' into v2.2.1-release

  Show description for 1fd8f68
  knoxHuang

  committed
  1fd8f68

  Copy full SHA for 1fd8f68

• Merge pull request #793 from knoxHuang/v2.2.1-release

  Show description for 230dfca
  jareguo

  authored
  230dfca

  Copy full SHA for 230dfca

Commits on Nov 19, 2019

• V2.2.1 release camera (#792)

  Show description for 6c81d71
  

  2youyou2

  authored and

  knoxHuang

  committed
  6c81d71

  Copy full SHA for 6c81d71

Commits on Nov 20, 2019

• fix resource loading (#795)

  

  PPpro

  authored and

  knoxHuang

  committed
  83e321d

  Copy full SHA for 83e321d

• add draw line graphics demo (#794)

  

  2youyou2

  authored and

  knoxHuang

  committed
  12b80de

  Copy full SHA for 12b80de

Commits on Nov 28, 2019

• fix net video crash on Huawei (#796)

  

  PPpro

  authored and

  knoxHuang

  committed
  066fb36

  Copy full SHA for 066fb36

Commits on Nov 29, 2019

• Merge commit '2.2.1-release' into v2.3.0

  Show description for 8ab7406
  knoxHuang

  committed
  8ab7406

  Copy full SHA for 8ab7406

Commits on Dec 3, 2019

• revert load next scene code (#797)

  knoxHuang

  authored
  7d1361d

  Copy full SHA for 7d1361d

• improve menu and spine / dragon bones case (#798)

  knoxHuang

  authored
  483b1c2

  Copy full SHA for 483b1c2

Commits on Dec 13, 2019

• Support Spine and DragonBones attach node (#801)

  Show description for b63d455
  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  b63d455

  Copy full SHA for b63d455

Commits on Dec 18, 2019

• update AppController.mm (#804)

  knoxHuang

  authored
  986a365

  Copy full SHA for 986a365

Commits on Dec 26, 2019

• support physics 3d and collision 3d (#802)

  Show description for e26f06e
  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  e26f06e

  Copy full SHA for e26f06e

• V2.3.0 add skeleton material test case (#805)

  Show description for c411c37
  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  c411c37

  Copy full SHA for c411c37

Commits on Dec 27, 2019

• update default physics module excluding (#807)

  Show description for cd5bf30
  

  PPpro

  authored and

  jareguo

  committed
  cd5bf30

  Copy full SHA for cd5bf30

Commits on Dec 30, 2019

• fixed effect error (#806)

  

  2youyou2

  authored and

  knoxHuang

  committed
  cc16ea5

  Copy full SHA for cc16ea5

• fix navigator on xiaomi for example-cases (#809)

  

  PPpro

  authored and

  knoxHuang

  committed
  3671e47

  Copy full SHA for 3671e47

Commits on Dec 31, 2019

• refine capture camera clear color (#808)

  

  2youyou2

  authored and

  knoxHuang

  committed
  812be39

  Copy full SHA for 812be39

• shield annotation (#810)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  62f78eb

  Copy full SHA for 62f78eb

• Replace http with https (#811)

  

  xunyi0

  authored and

  knoxHuang

  committed
  7b13f73

  Copy full SHA for 7b13f73

Commits on Jan 2, 2020

• improve videoPlayer-stayOnBottom platform restrictions (#812)

  knoxHuang

  authored
  eedb48a

  Copy full SHA for eedb48a

Commits on Jan 6, 2020

• change physics 3d enable to enabled (#813)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  f32b6b2

  Copy full SHA for f32b6b2

• upgrade some file version (#814)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  69e1466

  Copy full SHA for 69e1466

• Add example of particle3d. (#815)

  

  caryliu1999

  authored and

  knoxHuang

  committed
  b9e0be0

  Copy full SHA for b9e0be0

Commits on Jan 8, 2020

• fix skeleton enableDebugDraw (#816)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  f81cdcf

  Copy full SHA for f81cdcf

Commits on Jan 10, 2020

• change some url to https (#817)

  Show description for 3fce087
  

  wuzhiming

  authored and

  jareguo

  committed
  3fce087

  Copy full SHA for 3fce087

• modify event name (#818)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  3757e94

  Copy full SHA for 3757e94

• Fix custom trail material. (#819)

  Show description for 81eb766
  

  caryliu1999

  authored and

  knoxHuang

  committed
  81eb766

  Copy full SHA for 81eb766

• improve stayOnBottomCtrl code (#820)

  knoxHuang

  authored
  db59795

  Copy full SHA for db59795

Commits on Jan 14, 2020

• zFighting (#822)

  

  sunnylanwanjun

  authored and

  knoxHuang

  committed
  0103cd6

  Copy full SHA for 0103cd6

Commits on Jan 15, 2020

• auto release assets (#823)

  

  SantyWang

  authored and

  knoxHuang

  committed
  d446b6d

  Copy full SHA for d446b6d

Commits on Jan 17, 2020

• Modify some scenes of 3d particle. (#824)

  

  caryliu1999

  authored and

  knoxHuang

  committed
  dc98536

  Copy full SHA for dc98536

Commits on Feb 11, 2020

• object group image use case (#825)

  sunnylanwanjun

  authored
  e969b22

  Copy full SHA for e969b22

Commits on Feb 18, 2020

• add wechat pc (#827)

  Show description for c09be01
  PPpro

  authored
  c09be01

  Copy full SHA for c09be01

Commits on Feb 26, 2020

• add SafeArea example (#828)

  knoxHuang

  authored
  e9a90fc

  Copy full SHA for e9a90fc

Commits on Apr 30, 2020

• Support asset manager (#830)

  Show description for 5a57a87
  SantyWang

  authored
  5a57a87

  Copy full SHA for 5a57a87

Commits on May 6, 2020

• use resources to load scene (#831)

  SantyWang

  authored
  9a82b4b

  Copy full SHA for 9a82b4b

Commits on May 7, 2020

• Resave the preloaded test scene. (#832)

  Show description for 0764d7e
  caryliu1999

  authored
  0764d7e

  Copy full SHA for 0764d7e

Commits on May 8, 2020

• use subpackage path to load bundle (#833)

  SantyWang

  authored
  dfc4606

  Copy full SHA for dfc4606

Commits on May 19, 2020

• V2.4.0 add ttf test cases (#834)

  Show description for ca1cd62
  PatriceJiang

  authored
  ca1cd62

  Copy full SHA for ca1cd62

Commits on May 27, 2020

• load Bundle with name (#835)

  SantyWang

  authored
  89ea09a

  Copy full SHA for 89ea09a

Commits on Jun 1, 2020

• Don't show asset-bundle in preview (#836)

  Show description for 74b6f56
  SantyWang

  authored
  74b6f56

  Copy full SHA for 74b6f56

Commits on Jun 2, 2020

• add preload scene (#837)

  Show description for b24a35a
  SantyWang

  authored
  b24a35a

  Copy full SHA for b24a35a

Commits on Jun 5, 2020

• adjust resources bundle (#838)

  SantyWang

  authored
  c05f611

  Copy full SHA for c05f611

Commits on Jun 10, 2020

• support asset bundle in preview (#839)

  SantyWang

  authored
  a6c068b

  Copy full SHA for a6c068b

• update cacert.pem (#840)

  PatriceJiang

  authored
  fe03125

  Copy full SHA for fe03125

Commits on Jun 12, 2020

• a little refine (#841)

  SantyWang

  authored
  f45bd63

  Copy full SHA for f45bd63

Commits on Jul 30, 2020

• move appactivity to the right path (#846)

  wuzhiming

  authored
  a5dcef9

  Copy full SHA for a5dcef9

Commits on Oct 15, 2020

• sync V2.4.0 to V2.4.3 (#849)

  Show description for 057a0a8
  

  4 peopleauthored
  057a0a8

  Copy full SHA for 057a0a8