Skip to content

Commit

Permalink
Merge branch 'v2.2.1-release' (#799)
Browse files Browse the repository at this point in the history
* update meta 2.1.2 to 2.1.3

* ban videoPlayer keepRatio (#752)

* ban editbox case on alipay (#753)

* disable mesh example on ie11

* open downloader-web case (#755)

* add id to example cases

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

* add  mipmap example

* refine raycast example

* add screen-to-world-point example

* fixed cocos/2d-tasks/issues/1800

* add missing texture

* update meta

* improve Subpackages examples

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

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

* add dynamic batch mesh renderer example (#769)

* fix tiledmap change scene throw error (#770)

* update button transition in subpackage scene (#771)

* Add more message for websocket state displaying

add "Opened", "Error" and "Close" states to websocket state info

* Richer msgs for xhr states displaying

* let audio normally download when audio is playing

now audio will stop playing for deleting audio file before new audio download task start

* fixed capture native

* fix wrong jump height in case platform

* add shader example-cases (#779)

* Add ios access to Native_Call (#780)

* MotionStreak scene optimize (#781)

* add shader example-cases

* MotionStreak optimize

* Update MotionStreakCtrl.js

* Update MotionStreakCtrl.js

* Update MotionStreakCtrl.js

* 02_particle scenes optimize (#783)

* 02_particle scenes optimize

* Update ParticleControl.js

* fix md5 url for wssCacert (#787)

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

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

* fixed #783pr error commit (#790)

* V2.2.1 release camera (#792)

* add camera ortho size

* refine moving-objects

* refinde code

* refine code

* refine code

* refine name

* fix resource loading (#795)

* add draw line graphics demo (#794)

* fix net video crash on Huawei (#796)
  • Loading branch information
knoxHuang committed Dec 4, 2019
1 parent e74358c commit 0e5fad2
Show file tree
Hide file tree
Showing 507 changed files with 38,737 additions and 27,911 deletions.
1,273 changes: 709 additions & 564 deletions assets/TestList.fire

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/TestList.fire.meta
@@ -1,5 +1,5 @@
{
"ver": "1.2.0",
"ver": "1.2.2",
"uuid": "d13475c7-b37e-45d6-b6c5-25929e8a0925",
"asyncLoadAssets": false,
"autoReleaseAssets": true,
Expand Down

0 comments on commit 0e5fad2

Please sign in to comment.