Tags: amazingJie/engine
Tags
Merge 2.1.3 into v2.2.0 * commit 'a3de003db47b4afa537a97b829ad75069f48be95': fix browser breaking when playing audio on uc browser (cocos#5048) fix vec2、vec3、vec4 parameters type error (cocos#5064) Fix call node targetOff func has not remove node from target.__eventTargets array (cocos#5052) add play and stop sub particle for editor mode (cocos#5031) fix IE11's not supporting to Array.includes (cocos#5033) fix issue cocos#4942 BUG FIX: audio fail to register touch event listener && fix audio loading (cocos#4991) fix ecScene null (cocos#5000) Lifecycle: always call start, update, lateUpdate in try catch (cocos#4941) Fix a memory leak caused by the render-data not being properly released! (cocos#5025) avoid releasing builtin asset (cocos#4915) fix auto sync prefab rotation and z invalid (cocos#4975) revert fix pageview inertia invalid (cocos#4945) (cocos#4968) refine code (cocos#4964) fix pageview inertia invalid (cocos#4945) # Conflicts: # cocos2d/audio/CCAudio.js # cocos2d/core/graphics/graphics.js # cocos2d/core/load-pipeline/audio-downloader.js # cocos2d/core/platform/CCSys.js # cocos2d/core/renderer/index.js # cocos2d/core/utils/prefab-helper.js # cocos2d/renderer/render-data/render-data.js # cocos2d/tilemap/CCTiledMap.js
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
support alipay minigame (cocos#4880) * support alipay minigame * off onTextureLoaded callback
fix CCParticleSystem set material define wrong operation (cocos#4888)
Sync branch v2.0.10-patch to v2.1.2-release
PreviousNext