Knox
|
b402c3ebbc
|
update video player and web view event type (#7631)
|
2020-10-29 19:53:09 +08:00 |
|
Jare Guo
|
3cb569154b
|
Merge pull request #7629 from cocos-creator/runtime-deserializer
Runtime deserializer
|
2020-10-29 16:05:26 +08:00 |
|
Jare Guo
|
64e435badd
|
Merge remote-tracking branch 'gitlab/3d'
# Conflicts:
# package-lock.json
|
2020-10-29 15:36:36 +08:00 |
|
Jare Guo
|
60782d9a5e
|
bump package-lock.json
|
2020-10-29 15:31:16 +08:00 |
|
Jare Guo
|
cd1cf7faa3
|
Merge pull request #7469 from jareguo/3d-v1.2
New deserializer
|
2020-10-29 15:30:12 +08:00 |
|
Leslie Leigh (李的序)
|
d5e35a1823
|
Bump gift^2.0.9; Bump ts^4.0.5 (#7628)
|
2020-10-29 15:26:09 +08:00 |
|
Yun Hsiao Wu
|
c60a6ed251
|
pre-rotation adaptation: dynamics (#7625)
handle runtime orientation chanegs too
|
2020-10-29 13:45:16 +08:00 |
|
ChiaNing
|
9caad4d37a
|
pass overridePipelineStates change (#7617)
|
2020-10-29 13:40:11 +08:00 |
|
pandamicro
|
436e667f19
|
Fix scene auto release asset crash (#7619)
|
2020-10-29 10:52:29 +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 |
|
coulsonwang
|
663aa1bf52
|
fix native memory pool (#7615)
|
2020-10-28 18:24:23 +08:00 |
|
Leslie Leigh (李的序)
|
5c3e8883b5
|
@cocos/build-engine@4.0.0-jsb.alpha.12: Fix wrong SUPPORT_JIT constant (#7616)
|
2020-10-28 17:29:19 +08:00 |
|
pandamicro
|
02dbf00bb4
|
Fix wrong SUPPORT_JIT check (#7614)
|
2020-10-28 17:12:58 +08:00 |
|
Knox
|
37fec6341f
|
sync 2d (Update the url links) (#7613)
|
2020-10-28 17:06:27 +08:00 |
|
jiaxin.lai
|
3c17cb9e1e
|
refactor collision matrix (#7538)
* refactor collision matrix
* add deprecated
* tweaks
|
2020-10-28 14:15:20 +08:00 |
|
JoneLau
|
351b6480e4
|
add image stencil in mask (#7598)
* add image stencil in mask
* update
|
2020-10-28 12:13:53 +08:00 |
|
cary
|
eaa0da71cc
|
Synchronize some changes of 2d engine. (#7608)
|
2020-10-28 12:08:24 +08:00 |
|
Yun Hsiao Wu
|
a318283a41
|
fix pre-rotation adaptation (#7607)
|
2020-10-28 10:28:21 +08:00 |
|
Leslie Leigh (李的序)
|
f99240f664
|
@cocos/build-engine: add option to remove deprecated features (#7603)
|
2020-10-27 18:28:58 +08:00 |
|
Leslie Leigh (李的序)
|
903e79b90f
|
Docs/contribution/modules (#7605)
* Docs/contribution/modules
* Typo
|
2020-10-27 18:28:34 +08:00 |
|
jiaxin.lai
|
4cc4808072
|
correct the name of physics material (#7597)
* correct the name of PhysicsMaterial
* tweaks
|
2020-10-27 18:25:57 +08:00 |
|
cary
|
f8ef74ee4c
|
Synchronize parameter changes of commit comp. (#7604)
|
2020-10-27 15:59:20 +08:00 |
|
cary
|
6bcc7933a9
|
Add motion streak and particle 2d. (#7588)
* Add motion streak and particle 2d.
* fix buffer error
* modify comment error
* fix ci
* fix comment
* modify some comment
|
2020-10-27 11:48:17 +08:00 |
|
coulsonwang
|
f51b754dab
|
reject pass phase for native (#7602)
|
2020-10-27 11:39:59 +08:00 |
|
Leslie Leigh (李的序)
|
9b4afb2983
|
@cocos/build-engine now accepts the loose option (#7601)
|
2020-10-27 11:10:30 +08:00 |
|
pandamicro
|
983b994e43
|
Merge 2.x commits (#7600)
|
2020-10-27 09:13:33 +08:00 |
|
Leslie Leigh (李的序)
|
4262bf097a
|
Bump @cocos/build-engine to 4.0.0-jsb.alpha.9 (#7594)
|
2020-10-27 09:13:26 +08:00 |
|
ChiaNing
|
ca87207d7f
|
UI stencil cache add (#7595)
* stencil cache add
* function format change
* format change
|
2020-10-26 19:04:23 +08:00 |
|
ChiaNing
|
b10e8c5bcd
|
DescriptorSet Cache add (#7591)
* DescriptorSet Cache add
* commitComp function format change
* api in texture-base remove
|
2020-10-26 16:13:41 +08:00 |
|
coulsonwang
|
f875a56e02
|
add sphere and spot light handle (#7587)
|
2020-10-26 15:25:21 +08:00 |
|
Yun Hsiao Wu
|
40d959e718
|
gfx: pre-rotation on android (#7586)
|
2020-10-26 10:31:17 +08:00 |
|
yinkaile
|
caebaa11c1
|
export pass-phase (#7590)
|
2020-10-23 21:27:09 +08:00 |
|
Leslie Leigh (李的序)
|
19c5c7794c
|
Add editor/exports/macro (#7592)
|
2020-10-23 16:45:25 +08:00 |
|
PP
|
2304ce20a0
|
change OPPO/Vivo quick game to mini game (#7589)
|
2020-10-23 11:29:50 +08:00 |
|
PP
|
f93c6ed7d4
|
update jsb-editbox adapter to ES6 (#7584)
|
2020-10-22 20:32:01 +08:00 |
|
Yun Hsiao Wu
|
c53d9f0ffb
|
update effects (#7585)
|
2020-10-22 17:34:59 +08:00 |
|
pandamicro
|
7591f63b7f
|
Update engine version (#7583)
* Update engine version to 3.0
* Update authors
|
2020-10-22 15:38:30 +08:00 |
|
pandamicro
|
e5f929c7b1
|
Merge pull request #7580 from pandamicro/3d
Merge v1.2
|
2020-10-22 13:45:30 +08:00 |
|
pandamicro
|
02e8457bfa
|
Revert "Merge 3d-v1.2 (#7575)" (#7579)
This reverts commit 2980191f5a.
|
2020-10-22 13:43:15 +08:00 |
|
pandamicro
|
2980191f5a
|
Merge 3d-v1.2 (#7575)
* tweaks tooltip of isTrigger (#7485)
* UI material stencil state change bug fix (#7497)
* auto-shadow-info (#7404)
* auto-shadow-info
* add bais control
* update control name
* merge cc_shadowPCF(Vec2) && cc_shadowSize(Vec2) to cc_shadowInfo(Vec4)
* fix terrain bound error, terrain support dynamic lighting (#7505)
* fix terrain bound error, terrain support dynamic lighting
* fix terrain fog
Co-authored-by: Myway3D1 <404793124@qq.com>
* 3d v1.2 terrain support dynamic lighting (#7510)
* fix terrain bound error, terrain support dynamic lighting
* fix terrain fog
* standard surface add lighting map info
* Revert pcf filter
Co-authored-by: Myway3D1 <404793124@qq.com>
* fix sphere.margeAABB bug (#7518)
* fix sphere.margeAABB bug && Optimize automatic shadow calculation
* Even if the obstruction is not in the field of view, the shadow is still visible
* optimization,and avoid using sphere.radius < 0
* Avoid creating aabb repeatedly
* update
* adjust the Graphics structure to support continuous data filling (#7523)
* adjust the Graphics structure to support continuous data filling (#7524)
* Revert "adjust the Graphics structure to support continuous data filling (#7523)"
This reverts commit b86f3ccec1.
* adjust the Graphics structure to support continuous data filling (#7359)
* add terrain shadow (#7500)
* add terrain shadow
* update
* update
* update
* delete temp source code
* Optimize the auto shadow
* shadow 和 0 号对齐
* add reciveshadow control
* cancel
* fix shadow effect display error
* update
* use 1.0, doesnt use 1 in glsl
* update effects
* change bbMin && bbMax use Number.MAX_VALUE && Number.MIN_VALUE
* update
* update
* correct ammo kinematic object (#7534)
* 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)
* fix terrain receive shadow (#7535)
Co-authored-by: Myway3D1 <404793124@qq.com>
* Fix terrain receive shadow and load layer texture (#7543)
* fix terrain receive shadow
* fix load layer texture
Co-authored-by: Myway3D1 <404793124@qq.com>
* ui batch marge for stencil (#7540)
* tweaks (#7544)
* fix sync instantiate-jit (#7550)
* Refine type define
* Fix TypedArray instantiation in Prefab (sync commit 0361c4eb4fe09021b8cecb8d2122fa05220e68fa)
* resign instantiate-jit #5114
* fix shadow.far not enough (#7548)
* fix shadow.far not enough
* Add restrictions
* Remove duplicate code
* Update distance.ts (#7558)
碰撞检测有问题
* update internal db prefab meta version (#7556)
* Fix shadows merge conflicts
Co-authored-by: jiaxin.lai <goodlaijiaxin@qq.com>
Co-authored-by: ChiaNing <sun.cloud.mo@gmail.com>
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com>
Co-authored-by: Myway <MSoft1115@hotmail.com>
Co-authored-by: Myway3D1 <404793124@qq.com>
Co-authored-by: JoneLau <32630749+JoneLau@users.noreply.github.com>
Co-authored-by: Jare Guo <jareguo@users.noreply.github.com>
Co-authored-by: hujf <41710215+kissSimple@users.noreply.github.com>
Co-authored-by: 黄森斌 <arsen2010@126.com>
|
2020-10-22 13:39:01 +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 |
|
PP
|
2821b3db1c
|
fix circular dependency (#7570)
|
2020-10-22 11:40:30 +08:00 |
|
Knox
|
16e694fa5b
|
sync 2d i18n (#7576)
|
2020-10-22 11:31:33 +08:00 |
|
Knox
|
e65555d065
|
sync 2d playOnFocus default value (#7573)
|
2020-10-22 11:08:13 +08:00 |
|
Knox
|
6e516fefd8
|
sync 2d jsb-game (#7577)
|
2020-10-22 11:03:45 +08:00 |
|
Knox
|
4a062a4013
|
sync 2d sys browserType and browserVersion (#7578)
|
2020-10-22 10:34:11 +08:00 |
|
pandamicro
|
c118e5327e
|
Fix shadows merge conflicts
|
2020-10-21 23:15:46 +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 |
|