Tags: ZuoEr/engine
Tags
improve font engine error map (cocos#5399) * improve font engine error map * improve code * update warnID * refine code
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
fix CCParticleSystem set material define wrong operation (cocos#4888)
Sync branch v2.0.10-patch to v2.1.2-release
PreviousNext