Jare Guo
676c267150
remove RawAsset (sync #6286 ) ( #7697 )
2020-11-08 22:45:15 +08:00
Jare Guo
a0d5508779
simplify attribute implements (sync #5040 ) ( #7679 )
2020-11-05 17:37:56 +08:00
Jare Guo
9bf46ac0a5
obsolete target support of deserializer (sync #6494 ) ( #7680 )
...
* fix merge error (resync #6285 )
* fix rare editor crash caused by invalid PrivateNode data (sync #6971 )
* obsolete target support of deserializer (sync #6494 )
2020-11-03 13:39:23 +08:00
Jare Guo
e2b740dd15
Finally merge runtime deserializer & asset manager ( #7648 )
...
* sync asset-manager
refine
refine
refine
* change director
* refine
* fix bugs
* commit
* refine and fix bugs
* refine docs
* fix bugs
* merge
* fix bugs
* fix bugs
* merge
* sync jsb-adapter
* fix ci
* adapt preloading process for new Deserializer
* adapt preloading process for new Deserializer
* fix bugs
* minor fix
* dump dependency of SpriteFrame explicitly (sync #6938 )
* dump dependency of SpriteFrame explicitly (sync #6938 )
* remove unused variable
* exporting should trigger uuid compression in serializer
* refine
* fix ci
Co-authored-by: Santy-Wang <wh19930829@qq.com >
2020-10-30 20:51:58 +08:00
pandamicro
6101d772a2
Merge remote-tracking branch 'origin/3d-v1.2' into 3d
...
# Conflicts:
# EngineErrorMap.md
# cocos/core/3d/builtin/effects.ts
# cocos/core/data/decorators/property.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/forward/scene-culling.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/shadows.ts
# cocos/core/renderer/ui/mesh-buffer.ts
# cocos/core/renderer/ui/ui-vertex-format.ts
# cocos/core/scene-graph/scene-globals.ts
# cocos/terrain/terrain.ts
# cocos/ui/assembler/graphics/webgl/graphics-assembler.ts
# cocos/ui/components/graphics.ts
# editor/assets/default_prefab/3d/Capsule.prefab.meta
# editor/assets/default_prefab/3d/Cone.prefab.meta
# editor/assets/default_prefab/3d/Cube.prefab.meta
# editor/assets/default_prefab/3d/Cylinder.prefab.meta
# editor/assets/default_prefab/3d/Plane.prefab.meta
# editor/assets/default_prefab/3d/Quad.prefab.meta
# editor/assets/default_prefab/3d/Sphere.prefab.meta
# editor/assets/default_prefab/3d/Torus.prefab.meta
# editor/assets/default_prefab/Camera.prefab.meta
# editor/assets/default_prefab/Terrain.prefab.meta
# editor/assets/default_prefab/effects/Particle System.prefab.meta
# editor/assets/default_prefab/light/Directional Light.prefab.meta
# editor/assets/default_prefab/light/Sphere Light.prefab.meta
# editor/assets/default_prefab/light/Spot Light.prefab.meta
# editor/assets/default_prefab/ui/Button.prefab.meta
# editor/assets/default_prefab/ui/Canvas.prefab.meta
# editor/assets/default_prefab/ui/EditBox.prefab.meta
# editor/assets/default_prefab/ui/Label.prefab.meta
# editor/assets/default_prefab/ui/Layout.prefab.meta
# editor/assets/default_prefab/ui/Mask.prefab.meta
# editor/assets/default_prefab/ui/ProgressBar.prefab.meta
# editor/assets/default_prefab/ui/ScrollView.prefab.meta
# editor/assets/default_prefab/ui/Slider.prefab.meta
# editor/assets/default_prefab/ui/Sprite.prefab.meta
# editor/assets/default_prefab/ui/Toggle.prefab.meta
# editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
# editor/assets/default_prefab/ui/Widget.prefab.meta
2020-10-21 18:35:11 +08:00
Jare Guo
0319477911
fix decorator warning of ValueTypes ( #7553 )
...
* fix decorator warning of ValueTypes (sync #6285 )
* refresh copyright
2020-10-21 16:31:41 +08:00
Jare Guo
a0a992de5d
remove asserts from addChild & sync 2D changes ( #7479 )
...
* remove asserts from addChild
* expose js._registeredClassIds & js._registeredClassNames (sync #3174 )
To unload scripts dynamically.
Also revert part of changes from https://github.com/cocos-creator/engine/pull/3204/files#diff-cabe5229c3c6e31339220008e54fe853L421
* remove unused code (sync #3174 )
* minor tweak (sync #3421 )
* should not invoke component if destroy() called before node activating (sync #3430 )
* node should removed and destroyed with scene (sync #3456 #3483 )
* fix WebGL detection on Android browsers (sync #3510 )
* remove redundant right shift for bitwise operation (sync #3754 )
* fix label blur when using dark font color (sync #3949 )
* refine tooltip of Block Input Event (sync #4053 )
* fix IE/Edge exception when output log/warn before engine initialization(sync #4447 , #4500 )
* sync class, attribute (#4689 , #4712 , #4781 , #4712 )
* fix loading unknown texture format (sync #4820 )
* prefer toLowerCase to toLocaleLowerCase + sync #5114
* optimize bezier calculation (sync #5155 )
* fix potential memory leak in scene-editor (sync #5643 )
* fix _posDirty error of Mask on native platform (sync #6168 )
2020-10-15 17:28:14 +08:00
pandamicro
1d2a82d957
Merge branch '3d-v1.2' into merge1.2
...
# Conflicts:
# cocos/core/3d/framework/mesh-renderer.ts
# cocos/core/components/ui-base/ui-renderable.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/forward/scene-culling.ts
# cocos/core/pipeline/render-additive-light-queue.ts
# cocos/core/pipeline/render-stage.ts
# cocos/core/pipeline/shadow/shadow-flow.ts
# cocos/core/renderer/core/memory-pools.ts
# cocos/core/renderer/scene/camera.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/render-scene.ts
# cocos/core/root.ts
# cocos/particle/billboard.ts
# cocos/terrain/terrain.ts
# cocos/ui/components/button.ts
# package-lock.json
# package.json
# tests/general/sealed-global-variables.json
2020-09-02 18:39:09 +08:00
Leslie Leigh (李的序)
bc5b531191
Add decorator @editable @serializable ( #7178 )
2020-09-02 11:44:12 +08:00
zhefeng.zhang
ec566ce2d5
sync #6076 ( #7161 )
2020-08-27 10:53:09 +08:00
pandamicro
b2830f5271
Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d
...
# Conflicts:
# cocos/core/3d/builtin/effects.ts
# cocos/core/3d/framework/light-component.ts
# cocos/core/3d/framework/model-component.ts
# cocos/core/animation/animation-state.ts
# cocos/core/assets/image-asset.ts
# cocos/core/data/object.ts
# cocos/core/event/callbacks-invoker.ts
# cocos/core/game.ts
# cocos/core/gfx/webgl/webgl-commands.ts
# cocos/core/gfx/webgl2/webgl2-commands.ts
# cocos/core/pipeline/define.ts
# cocos/core/platform/event-manager/events.ts
# cocos/core/primitive/primitive.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/render-scene.ts
# cocos/core/root.ts
# cocos/core/scene-graph/node-event-processor.ts
# cocos/core/splash-screen-webgl.ts
# cocos/particle/index.ts
# cocos/terrain/terrain.ts
# exports/base.ts
2020-06-17 14:47:36 +08:00
Leslie Leigh (李的序)
3b31edae67
Fix once bug ( #6889 )
2020-06-17 12:01:11 +08:00
pandamicro
845fc81fce
Improve CallbacksInvoker to remove __eventTargets mechanism ( #6837 )
...
* Improve CallbacksInvoker to remove __eventTargets mechanism
* Fix return value in Eventify.once
* Use isValid to check callback target validity
* Ensure event processor destroy during node destroy
* Fix node once can't remove touch/mouse listeners issue
* Strict check to include TO_DESTROY and DESTROYED state
* Remove execute and invoke directly in emit
* Fix ci
2020-06-09 11:23:20 +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
Leslie Leigh (李的序)
2a2a56ad2b
Solve the "once-off" problem ( #6782 )
...
* Solve the "once-off" problem
* Revert CallbacksInvoker
* Update
* Optimize
2020-05-29 15:20:49 +08:00
SijieWang
4d0c9c0249
Replace methods that cannot be used ( #6743 )
2020-05-27 17:35:34 +08:00
Lelie Leight (李的序)
d446a357ce
Warn on explicit undefined type ( #5770 )
2019-11-23 18:17:45 +08:00
Lelie Leight (李的序)
441435e474
optimize size of serialized animation clip ( #5559 )
2019-10-21 15:35:20 +08:00
SijieWang
b215a60e3e
Delete some of the Editor references ( #5345 )
...
* Delete some of the Editor references
* review code
* test case
2019-09-09 09:58:31 +08:00
pandamicro
1380e46c34
Unittest ( #4973 )
...
* unit test for ts
* Fix ts-jest warnings
* Remove puppeteer for now
* fix physics define and jest config for windows
* Replace Node ref with INode ref
* Fix ci issue
* Fix
* tweak
* tweak
* Fix vscode launcher
* now physics framework export all physics component (#28 )
* tweaks
2019-07-25 17:15:20 +08:00