Commit Graph

154 Commits

Author SHA1 Message Date
pandamicro b162e21a93 Update license and API language declaration (#7750)
* Update licenses

* Update license for audio

* Update license for core/3d

* Update license for animation, assets, asset-manager, components, data

* update license for event, geometry, gfx

* update license for core modules

math, memop, pipeline, platform, primitive, renderer, scene-graph, utils, value-types

* Update license for core

* Update license for particle and particle-2d

* Update license for particle part2

* Update license for physics and physics-2d

* Update license for all modules in cocos

* Update license for exports

* Fix API doc language declaration
2020-11-10 17:36:31 +08:00
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +08:00
Jare Guo 676c267150 remove RawAsset (sync #6286) (#7697) 2020-11-08 22:45:15 +08:00
Leslie Leigh (李的序) b6937ea897 Fix foolish bug! (#7726) 2020-11-07 11:11:09 +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
Jare Guo cd1cf7faa3 Merge pull request #7469 from jareguo/3d-v1.2
New deserializer
2020-10-29 15:30:12 +08:00
Jare Guo d0db3bfd65 minor tweak 2020-10-28 23:51:55 +08:00
Jare Guo df5fc6c9a1 fix merge error 2020-10-28 23:51:55 +08:00
Jare Guo b7c56393d5 Merge remote-tracking branch 'fireball/3d' into 3d-v1.2
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/class.ts
#	cocos/core/data/deserialize.ts
#	package.json
2020-10-28 18:37:39 +08:00
pandamicro f31968e999 Merge remote-tracking branch 'origin/3d' into 3d
# Conflicts:
#	cocos/core/platform/sys.ts
2020-10-22 11:52:25 +08:00
Knox e65555d065 sync 2d playOnFocus default value (#7573) 2020-10-22 11:08:13 +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 c6fa350e62 should not disable strictFunctionTypes, sync changes from jareguo/engine#4 2020-10-19 17:45:33 +08:00
Leslie Leigh (李的序) 114746ec50 Remove es5 cc class (#7504)
* Remove empty comments

* Remove CCClass() style class declaration

* Optimize
2020-10-19 11:51:37 +08:00
Jare Guo da6ec26b52 fix sync instantiate-jit (#7550)
* Refine type define

* Fix TypedArray instantiation in Prefab (sync commit 0361c4eb4fe09021b8cecb8d2122fa05220e68fa)

* resign instantiate-jit #5114
2020-10-16 23:41:58 +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
Jare Guo c6002fc388 sync #4712 2020-10-12 20:34:44 +08:00
pandamicro 7481303268 Merge branch '3d-v1.2' into 3d
# Conflicts:
#	cocos/core/3d/framework/camera-component.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/components/component-event-handler.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/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/scene/skybox.ts
#	cocos/core/splash-screen.ts
#	cocos/ui/components/button.ts
#	cocos/ui/components/editbox/edit-box-impl.ts
#	editor/assets/primitives.fbx
#	package-lock.json
#	package.json
2020-09-30 18:01:33 +08:00
Jare Guo 4e08e87e4d fix ci 2020-09-28 19:00:04 +08:00
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
Jare Guo 43b565153f remove unneeded rollup plugins 2020-09-28 16:37:24 +08:00
Jare Guo 0b1fa249da bug fixes and sync remain codes
fuck
2020-09-28 16:37:24 +08:00
Jare Guo 6a2cdf7e66 export declarations for editor 2020-09-27 19:25:00 +08:00
Jare Guo 1f5c1bb0c9 embed -dynamic interface into -compiled to support ts declare and use an unify Details class 2020-09-27 19:25:00 +08:00
Jare Guo 066bcf7bb3 customize rollup compiler to reduce code size 2020-09-27 19:25:00 +08:00
Jare Guo 17e327bf28 support new serialization at runtime 2020-09-27 19:25:00 +08:00
Yun Hsiao Wu b2d9249dae fix circular refs (#7354) 2020-09-10 15:19:38 +08:00
minggo 736e13a815 sync from 1.2 (#7314)
* sync from 1.2

* delete unneeded codes
2020-09-04 17:59:23 +08:00
pandamicro 3539945cf4 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
# Conflicts:
#	tests/general/sealed-global-variables.json
2020-09-03 11:30:28 +08:00
pandamicro 9bb07a606d Fix issue 2020-09-03 11:29:53 +08:00
Leslie Leigh (李的序) 6e8d071b99 Disable instantiate-jit for now (#7286) 2020-09-03 11:24:47 +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
zheng han f1d0844ac0 add some type to deserialize code (#7274)
* add some type to deserialize code

* remove code

* fix export
2020-09-02 17:18:34 +08:00
pandamicro 3240dba206 Component rename for new standard and 2d compatibility (#7103)
* Rename ui related components

* Rename files

* Remove Useless errors

* Fix sealed names

* Fix sealed global variables

* Fix circular reference

* Refactor more component names

* Rename particle and animation related component

* export scene and models sub module in renderer

* Rename ModelComponents to Model

* Refactor LightComponents to Light

* Refactor CameraComponent to Camera

* Refactor ConstraintComponents to Constraint and rename physics comps

* Cleanup and fix issues

* Small fixes

* Refactor Model to MeshRenderer

* Final touch

* Fix data class export

* Better deprecation to cover all old usage

* Simpler and better deprecation with js.setClassAlias

* Fix ci

* Fix editor issue
2020-09-02 15:31:49 +08:00
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
cary e0df589214 export _Deserializer for adapter (#7256) 2020-08-31 11:48:33 +08:00
pandamicro 1b26d3dc7b Small fixes (#7202) 2020-08-21 16:27:32 +08:00
Leslie Leigh (李的序) 4f2eff842d Full optimize decorators (#7166)
* Full optimize decorators

* Conflicts

* Rename immutable -> readOnly

* Update

* Update

* Update
2020-08-18 19:10:34 +08:00
SB baa2102339 Update 2020-08-06 17:41:06 +08:00
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +08:00
Leslie Leigh (李的序) 26df6fb1c0 Optimize editor decorators (#7002) 2020-08-05 10:36:52 +08:00
Leslie Leigh (李的序) aeced26917 Solve duplicated menu issue (#6973) 2020-08-02 14:53:31 +08:00
GengineJS 72f14dc806 [Feature] Adding isPlaying judgement to support the function of gameview (#6990)
* [Modify] the systemevent adds the function of isplaying judgment

* [Feature] the ui adds the function of isplaying judgment

* [Modify] Add GameView environment

* [Optimize] Optimize the gameView conditions

* [Optimize] Complement the gameView environment
2020-07-21 17:36:07 +08:00
Leslie Leigh (李的序) 2d21364587 Throw the error instead of return null in instantiate and addComponent (#6940)
* Throw the error instead of return null in instantiate and addComponent

* Update
2020-07-10 15:03:11 +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
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