Skip to content

Tags: hortor-games/engine

Tags

2.2.0-dev

Toggle 2.2.0-dev's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Sync branch v2.1.4-release to v2.2.0-release

2.1.4

Toggle 2.1.4's commit message
Fixed matrix without restoring 3d nodes (cocos#5428)

deleted-branch-v2.1.4

Toggle deleted-branch-v2.1.4's commit message
Fixed matrix without restoring 3d nodes (cocos#5428)

deleted-branch-v2.1.3-release

Toggle deleted-branch-v2.1.3-release's commit message
Fixed matrix without restoring 3d nodes (cocos#5428)

2.1.3

Toggle 2.1.3's commit message
Fix the problem that the profile does not display. (cocos#5402)

* Fix the problem that the profile does not display.

* revert code

2.3.0

Toggle 2.3.0's commit message
Merge branch 'v2.2.0' into v2.3.0

* v2.2.0:
  fixed api link error. (cocos#4920)
  support alipay minigame (cocos#4880)
  fixed api docs (cocos#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (cocos#4910)
  remove warning when upgrading editBox compnent (cocos#4916)
  move platform related code (cocos#4913)
  fix warn after subContextView modules are excluded (cocos#4737)
  refine code (cocos#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (cocos#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/utils/profiler/CCProfiler.js

original-v2.2.0-non-native-renderer

Toggle original-v2.2.0-non-native-renderer's commit message

2.1.2

Toggle 2.1.2's commit message
fix CCParticleSystem set material define wrong operation (cocos#4888)

deleted-branch-v2.1.2-release

Toggle deleted-branch-v2.1.2-release's commit message

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Sync branch v2.0.10-patch to v2.1.2-release

2.0.11

Toggle 2.0.11's commit message
Fix a sorting error when the node have been removed. (cocos#4710) (co…

…cos#4836)

* Fix a sorting error when the node have been removed.

* avoid geter

(cherry picked from commit 6b9b796)