Commit Graph

33 Commits

Author SHA1 Message Date
Yun Hsiao Wu 32598c25cb switch to eslint (#7727)
* switch to eslint

* eslint: extends airbnb
2020-11-09 10:19:12 +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 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
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
Jare Guo 6a2cdf7e66 export declarations for editor 2020-09-27 19:25:00 +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
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +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
pandamicro a5c238dabb API translations in core (#6726)
* Add API translation for load pipeline

* Add API translation for core/data

* Fix decorator declarations

* API translation for scene graph

* Fix ci

* Fix ci

* Improve Eventify for event emit performance

* Fix ci

* improve format
2020-05-25 15:26:02 +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
Leslie Leigh (李的序) 284aa38d25 Build time constants (#6256)
* consts

* Bump @cocos/build-engine version

* Fix

* Upload @cocos/build-engine

* Rm scripts/build-engine/.gitignore
2020-03-11 14:05:22 +08:00
Leslie Leigh (李的序) 49d16626a2 Eliminate "cc." references to APIs in module "cocos/core/platform/debug" (#5861) 2019-12-12 19:07:14 +08:00
Lelie Leight (李的序) 1d50bd5496 export cc.isValid() (#5546) 2019-10-15 16:07:46 +08:00
Yun Hsiao Wu ff19a901c1 refine details (#5164)
* effect adapt

* restore tslint

* refine math constants
2019-08-15 21:52:32 -05:00
Yun Hsiao Wu 5f651dad6f fix circular ref (#5131)
* fix circular ref

* remove tslint usage
2019-08-08 21:25:54 -05:00
pandamicro cfddd96656 Fix some ts apis (#5108) 2019-08-06 20:11:39 +08:00
ChiaNing 00c904d6cb api-doc modfiy (#4803) 2019-07-03 16:07:49 +08:00
ChiaNing 9b3858a3e7 API-Doc format modify (#4761) 2019-07-01 09:33:24 +08:00
ChiaNing 408cc6f930 Copyright Notice format change (#4665) 2019-06-21 09:34:05 +08:00
ChiaNing 6ee7107a32 Format adjustment for api doc (#4625) 2019-06-14 14:43:21 +08:00
ChiaNing 53a1217a4d fix Component can't destroyed bug (#4519) 2019-05-29 17:40:49 +08:00
ChiaNing 44def350a0 Some core code modify to TS ( core/data/... ) ( bug fixed ) (#4466)
* Some core code modify to TS ( core/data/... ) ( bug fixed )

* Some core code modify to TS ( Fixed the problem before )

* change for of
2019-05-28 11:55:05 +08:00
ChiaNing acaecd2e26 Revert "Some core code modify to TS ( core/data/... ) (#4455)"
This reverts commit d7c6046807.
2019-05-21 10:42:51 +08:00
ChiaNing a217d4569a Revert "Fix Bug : Assets can‘t open bug (#4460)"
This reverts commit e77b2401c0.
2019-05-21 10:42:45 +08:00
ChiaNing e77b2401c0 Fix Bug : Assets can‘t open bug (#4460) 2019-05-20 19:41:10 +08:00
ChiaNing d7c6046807 Some core code modify to TS ( core/data/... ) (#4455) 2019-05-20 10:54:26 +08:00