mmyduckx
7d43d8b474
fix spine blend ( #8804 )
2021-06-12 20:23:30 +08:00
江战
9709ee0443
3.2 DevEco 升级到 501 ( #3596 )
2021-06-11 16:40:09 +08:00
minggo
4e527445e8
Merge pull request #3608 from minggo/merge_v3.1.2
...
Merge v3.1.2
2021-06-11 16:34:09 +08:00
minggo
13d3274136
fix conflict
2021-06-11 16:01:34 +08:00
minggo
30db2bcbda
merge v3.12 into v 3.3
2021-06-10 17:33:22 +08:00
zheng han
518c760737
fire event in _addComponentAt ( #8714 )
2021-06-10 14:56:43 +08:00
troublemaker52025
8ceb4beae7
add node.up && node.right ( #8643 )
...
* add node.up && node.right
* modify comments
* modify comments
* update
* Update cocos/core/scene-graph/node.ts
Co-authored-by: Santy-Wang <wh19930829@qq.com >
* Update cocos/core/scene-graph/node.ts
Co-authored-by: Santy-Wang <wh19930829@qq.com >
* Update cocos/core/scene-graph/node.ts
Co-authored-by: Santy-Wang <wh19930829@qq.com >
* Update cocos/core/scene-graph/node.ts
Co-authored-by: Santy-Wang <wh19930829@qq.com >
Co-authored-by: Santy-Wang <wh19930829@qq.com >
2021-06-10 11:58:06 +08:00
troublemaker52025
8d0e57b0c5
Delete imageAsset.texture for v3.3 ( #8707 )
...
* delete imageAsset._texture for v3.3
* fix merge
* update
* update
2021-06-10 10:56:27 +08:00
Zeqiang Li
839ed8e24f
shadow renderpass reuse logic ( #3605 )
2021-06-10 09:49:33 +08:00
troublemaker52025
b864e70d9d
Add global descriptor set manager for v3.1.2 ( #3606 )
2021-06-10 09:49:16 +08:00
cary
4305e4c132
Modify the memory pool and remove the deprecated code. ( #8776 )
2021-06-10 09:06:35 +08:00
cary
965037568c
Modify the memory pool and remove the deprecated code. ( #3599 )
2021-06-10 09:06:27 +08:00
cary
6d02e2bc17
Fix gizmo not render in editor. ( #8799 )
2021-06-09 17:26:11 +08:00
Santy-Wang
331ceeb444
Merge pull request #8795 from holycanvas/v3.3-merge
...
sync 3.1.2
2021-06-09 16:09:26 +08:00
santy-wang
e9e8c76801
sync v3.1.2
2021-06-09 16:07:56 +08:00
Santy-Wang
75f10acbb7
sync v3.1.2 ( #8794 )
...
* Do not modify local descriptor set v3.1.2 (#8773 )
* delete local descriptorSet for v3.1.2
* update
* V3.1.2 zxx43 particle (#8784 )
* fix https://github.com/cocos-creator/3d-tasks/issues/7421
* remove temp params & add create function to onFocusInEditor
* restrict particle system object count
* print error msg
* Add globalDSManager for v3.1.2 (#8727 )
* update
* update
* update
* update
* delete for of
* update
* update
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com >
Co-authored-by: zxx43 <zxx43@hotmail.com >
2021-06-09 16:04:16 +08:00
江战
518438f695
3.3 fix blend target js ( #8791 )
2021-06-09 15:35:02 +08:00
cary
f406185c87
Merge SSPR to v3.3. ( #3601 )
...
* support SSPR by hw
Co-authored-by: dddpppccc <291274416@qq.com >
2021-06-09 15:31:42 +08:00
黄森斌
f6a63f2c99
V3.3 set promoteSingleRootNode of fbx asset ( #8756 )
...
* texture-cube charater
(cherry picked from commit dca6ddf38571858be284a9ec6e4adcf456ffe1e1)
* revert texture-cube change
(cherry picked from commit d0cce40800d36977abeae9d43352a8890a2e1421)
* set promoteSingleRootNode of fbx asset
(cherry picked from commit d3be3c4707a5db624094e5558ae45604e0e5ae26)
2021-06-09 15:24:10 +08:00
PP
7e55ddf133
support SystemEvent.Keyboard enum type ( #8785 )
...
* support SystemEvent.Keyboard enum type
update
update
update
update
# Conflicts:
# cocos/core/platform/event-manager/system-event.ts
update pal
mark macro.KEY as warning
mark
update
update
* support right shift, alt and ctrl enum
* support web keyCode map
# Conflicts:
# pal/input/web/keyboard.ts
* support num enter key enum
* rename num_slash to num_divide
* support native keyCode map
# Conflicts:
# pal/input/native/keyboard.ts
* update enum
* rename Keyboard to KeyCode
* update deprecated
* update
2021-06-09 15:12:51 +08:00
minggo
424232493e
Merge pull request #8777 from minggo/merge_v3.1.2
...
Merge v3.1.2
2021-06-09 14:12:21 +08:00
cary
a8c6297071
Delete array_a reset. ( #31 )
2021-06-09 14:07:24 +08:00
PP
cbab5dd687
fix application lifecycle issue on Android platform ( #3478 )
2021-06-09 12:01:26 +08:00
troublemaker52025
6f0582da45
Add globalDSManager for v3.1.2 ( #8727 )
...
* update
* update
* update
* update
* delete for of
* update
* update
2021-06-09 11:49:29 +08:00
zxx43
f0f02c5dfa
V3.1.2 zxx43 particle ( #8784 )
...
* fix https://github.com/cocos-creator/3d-tasks/issues/7421
* remove temp params & add create function to onFocusInEditor
* restrict particle system object count
* print error msg
2021-06-09 11:46:25 +08:00
Leslie Leigh (李的序)
0ddc51ac71
Implements array.move() ( #8790 )
2021-06-09 11:34:58 +08:00
Zeqiang Li
219ec21abf
remove nativeSize() interface ( #3590 )
2021-06-09 09:54:55 +08:00
Zeqiang Li
ac09bea040
remove nativeSize() interface ( #8745 )
2021-06-09 09:54:46 +08:00
minggo
063681bba5
update binding codes ( #3604 )
2021-06-08 17:08:22 +08:00
cary
7a265315b2
merge node change of v3.1.2 ( #30 )
2021-06-08 15:39:43 +08:00
Leslie Leigh (李的序)
b8bed774df
Fix editor extendable ( #8782 )
...
* Fix editor extendable
* Update editor-extendable.ts
* Update editor-extendable.ts
2021-06-08 11:27:54 +08:00
cary
dbfcdd04e7
Merge SSPR to v3.3. ( #8780 )
2021-06-08 11:23:51 +08:00
zheng han
7dcce93d4f
fix readonly tsc compile ( #8772 )
2021-06-08 09:35:14 +08:00
Yun Hsiao Wu
88de89c81c
fix triple buffer update inside cmdBuff ( #3600 )
2021-06-08 09:00:48 +08:00
Leslie Leigh (李的序)
34942a1894
Add editor extendable ( #8778 )
...
* Add editor extendable
* Update signature
* Doc
2021-06-07 19:58:23 +08:00
PP
4914116834
optimize SystemEventType and NodeEventType ( #8678 )
...
* remove recomendation for usage of string type of event
* deprecate KEY_DOWN KEY_UP event
* support SystemEventType.KEYBOARD_DOWN && SystemEventType.KEYBOARD_UP
* deprecate some useless properties
* implement keyboard pal
* remove SystemEventType toString()
update
* fix instantiating EventTouch
* optimize deprecated info
* support native keyboard KEYBOARD_DOWN event
* remove usage of event code
* fix deprecating pure value properties
* optimize deprecating Event type
* optimize deprecating getEventCode()
update
* optimize deprecating eventType
* optimize deprecating isPressed
* optimize deprecating keybaord event
* optimize deprecating rawEvent
* Revert "fix deprecating pure value properties"
This reverts commit 60d586532496fa1f422f05c54a922b86d1dc96ee.
* fix deprecate pure value properties
* Revert "fix deprecate pure value properties"
This reverts commit a83f1725fedfbd7af445892912aacab8e8502147.
* fix deprecating pure value property
* update
updaate
* deprecate some EventType enum in SystemEventType and NodeEventType
* optimize
* update
update
* update
* update
* fix CI
* fix CI
* fix Circular dependency
* fix Circular dependency
2021-06-07 19:06:29 +08:00
minggo
b9975b9953
Update README.mdown
...
modify python version on windows
2021-06-07 17:17:18 +08:00
minggo
84bd13c9d1
remove duplicated codes
2021-06-07 16:11:47 +08:00
minggo
9f2a83330d
merge v3.1.2
2021-06-07 16:01:03 +08:00
troublemaker52025
bc7a9cedc1
delete local descriptorSet for v3.2.0 ( #8774 )
2021-06-07 15:46:02 +08:00
troublemaker52025
f5739c4dfe
Do not modify local descriptor set v3.1.2 ( #8773 )
...
* delete local descriptorSet for v3.1.2
* update
2021-06-07 15:39:17 +08:00
troublemaker52025
6b5238bd3d
delete update local descriptorSet v3.3 ( #8775 )
2021-06-07 15:39:02 +08:00
Leslie Leigh (李的序)
a2266c9651
Optimize and refactor skeletal animation blending ( #8753 )
...
* Optimize and refactor skeletal animation blending
* Type error
2021-06-07 14:52:16 +08:00
minggo
e84c36ad24
fix compiling errors on all platforms but native ( #8769 )
2021-06-07 11:24:40 +08:00
Yun Hsiao Wu
35e4cb81ec
take over native device initialization ( #8767 )
2021-06-07 11:10:17 +08:00
Yun Hsiao Wu
448ea846d8
create device in JS ( #3598 )
2021-06-07 11:10:06 +08:00
cary
f37099c294
Change the parameter of the math library to Readonly. ( #8765 )
...
* Change the parameter of the math library to Readonly.
* fix ci
* fix ci
* fix ci
* fix ci
* fix ci
* delete pool
2021-06-04 17:36:15 +08:00
zheng han
4ce1bc896e
add editorExtras to CCObject ( #8766 )
2021-06-04 16:58:42 +08:00
zxx43
77c3e94faa
V3.1.2 zxx43 performance 2 ( #8764 )
...
* reduce clear frequency & check translate or rotate in updateWorldTransform function https://github.com/cocos-creator/3d-tasks/issues/7487
* make clear node as a static function
2021-06-04 14:34:01 +08:00
Yun Hsiao Wu
8570e27bc3
fix morph instance reuse ( #8761 )
2021-06-04 14:06:00 +08:00