Knox
37fec6341f
sync 2d (Update the url links) ( #7613 )
2020-10-28 17:06:27 +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
pandamicro
4b84548381
Finish core API translation ( #7397 )
2020-09-17 00:06:19 +08:00
Knox
85209df78e
sync 2d richt text component ( #7085 )
2020-08-17 11:28:16 +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
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
JoneLau
d997ebeaad
add rich-text ( #4183 )
2019-04-10 15:42:49 +08:00