Commit Graph

8 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) adfdb67bb8 Eliminate cc.* log functions invocation (#6845) 2020-06-10 14:19:11 +08:00
SijieWang a9f3969245 Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/audio/assets/clip.ts
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/batched-skinning-model-component.ts
#	cocos/core/3d/framework/editor-camera-component.ts
#	cocos/core/3d/framework/index.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-manager.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/animation/skeletal-animation-component.ts
#	cocos/core/animation/skeletal-animation-state.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/assets/simple-texture.ts
#	cocos/core/assets/sprite-frame.ts
#	cocos/core/assets/texture-base.ts
#	cocos/core/data/class-decorator.ts
#	cocos/core/data/instantiate.ts
#	cocos/core/event/event-target.ts
#	cocos/core/game.ts
#	cocos/core/load-pipeline/CCLoader.ts
#	cocos/core/load-pipeline/plist-parser.ts
#	cocos/core/load-pipeline/unpackers.ts
#	cocos/core/load-pipeline/url.ts
#	cocos/core/math/deprecated.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/scene-graph/base-node.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	predefine.ts
2020-06-03 13:25:42 +08:00
pandamicro 91a41a2c61 Safe emit game events to avoid editor startup failure (#6779)
* Safe emit game events so that it won't break editor startup

* Correct API

* remove useless indexof
2020-05-29 14:26:50 +08:00
Leslie Leigh (李的序) 5e2adea787 Rename internal usages of global variable 'cc' into 'legacyGlobalExpo… (#6680)
* Rename internal usages of global variable 'cc' into 'legacyGlobalExports'

* Fix CI

* Rename 'legacyGlobalExports' -> 'legacyCC'
2020-05-14 15:46:45 +08:00
ChiaNing 408cc6f930 Copyright Notice format change (#4665) 2019-06-21 09:34:05 +08:00
Leslie Leigh 19e615f577 Animation weight and blending (#4199)
* remove cc.xx

* animation: weight and blending
2019-04-12 18:29:42 +08:00
Leslie Leigh a40b91e7fe anim (#4168) 2019-04-09 09:35:23 +08:00
Leslie Leigh 5936b42393 animation (#4153)
* animation

* animation

* update
2019-04-04 19:09:09 +08:00