minggo
|
2e4289159f
|
Merge pull request #4209 from minggo/v3.5.0_merge_v3.4.2
V3.5.0 merge v3.4.2
|
2022-01-24 18:24:55 +08:00 |
|
jk20012001
|
dbc22fe878
|
fix shader code style (#10039)
|
2022-01-24 18:18:24 +08:00 |
|
minggo
|
f08555248f
|
fix conflict
|
2022-01-24 17:23:03 +08:00 |
|
Yun Hsiao Wu
|
14a17c9d22
|
license upgrade (#4210)
|
2022-01-24 17:18:47 +08:00 |
|
pandamicro
|
a42259dce4
|
Merge pull request #10040 from holycanvas/v3.5.0-merge
sync 3.4.2
|
2022-01-24 16:53:25 +08:00 |
|
minggo
|
45f096ead8
|
fix compiling error
|
2022-01-24 16:42:39 +08:00 |
|
santy-wang
|
2377830761
|
update effect
|
2022-01-24 16:34:23 +08:00 |
|
santy-wang
|
995f5b2d41
|
Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge
|
2022-01-24 15:56:49 +08:00 |
|
minggo
|
1552345596
|
Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2
Conflicts:
cocos/platform/android/jni/JniCocosActivity.cpp
cocos/platform/apple/JsbBridgeWrapper.mm
cocos/platform/ohos/jni/JniCocosAbility.cpp
cocos/renderer/gfx-metal/MTLCommandBuffer.mm
external/config.json
|
2022-01-24 15:01:01 +08:00 |
|
zxx43
|
55cd1f9e61
|
V3.4.2 2d particle fix (#10038)
* fix 2d particle bug
* modify engine version
|
2022-01-24 13:22:44 +08:00 |
|
timlyeee
|
83ecd19721
|
Divide foreground tasks and all-time tasks (#4206)
* Add JsbBridgeWrapper for ohos
* Divide Foreground tasks and all-time tasks
* implement a taskQ class
* Add ohos support
|
2022-01-24 10:25:05 +08:00 |
|
zhakesi
|
cff5293a45
|
V3.4.1 local db (#10031)
* fix db can not move in editor
* fix db native mode
|
2022-01-21 19:00:04 +08:00 |
|
zhakesi
|
11ec677182
|
fix TiledLayer culling row and col (#10035)
|
2022-01-21 18:58:37 +08:00 |
|
Santy-Wang
|
8878fa832f
|
Merge pull request #10034 from pandamicro/v3.4.2
Merge v3.4.1
|
2022-01-21 15:15:05 +08:00 |
|
pandamicro
|
a3039ed9a2
|
Update version
|
2022-01-21 15:00:56 +08:00 |
|
pandamicro
|
46f90c85dc
|
Merge branch 'v3.4.1' into v3.4.2
|
2022-01-21 15:00:15 +08:00 |
|
troublemaker52025
|
8775b73ff0
|
shadow info migration for v3.5.0 (#9857)
* shadow info mifration for v3.4.1
* fix ci error
* add deprecated
* fix merge error
* fix merge error 2
* update
* Add comments
|
2022-01-21 13:14:28 +08:00 |
|
xubing
|
e30c4e4cb6
|
Skybox optimization (#10004)
* Skybox optimization
* update notes
* remove legacy parameters
* update notes
* changing variable names
|
2022-01-21 11:39:41 +08:00 |
|
shaoqiangcai
|
e7429e59da
|
Update run_test_cases.yml (#10030)
添加PR-Test到3.5.0的分支
|
2022-01-21 11:30:50 +08:00 |
|
timlyeee
|
49c57bd9c5
|
Add JsbBridgeWrapper for ohos (#4204)
|
2022-01-21 11:10:38 +08:00 |
|
timlyeee
|
4d8b3a1266
|
add OHOS platform detection (#10028)
|
2022-01-21 11:09:01 +08:00 |
|
Yun Hsiao Wu
|
8f6b6b3f48
|
binding mappings (#10013)
|
2022-01-21 10:07:56 +08:00 |
|
Yun Hsiao Wu
|
a360e4390a
|
gfx: refactor binding mappings (#4195)
* gfx: refactor binding mappings
* fg: fix scissor merge
* fix genbindings on PyYAML 6.0+
|
2022-01-21 09:43:55 +08:00 |
|
Zeqiang Li
|
08dadb4fae
|
wgpu ci sdk update to latest (#4202)
* wgpu ci
* update emsdk to latest
|
2022-01-21 09:43:21 +08:00 |
|
jk20012001
|
cb0ac4e916
|
Fix planar shadow z-fighting (#10026)
* Fix planar shadow z-fighting
* Fix planar shadow z-fighting
|
2022-01-20 23:22:34 +08:00 |
|
jk20012001
|
7795174709
|
add default skybox (#10021)
* Add default skybox for template scene
* adjust light dir to fit sun position
|
2022-01-20 11:59:56 +08:00 |
|
Zeqiang Li
|
8ffcf82748
|
wgpu ci (#4201)
|
2022-01-20 11:47:49 +08:00 |
|
Zeqiang Li
|
aa95a22288
|
subpass + invalid depth binding + valid dsAttachment format (#4198)
* subpass + invalid depth binding + valid dsAttachment format
* append
|
2022-01-19 16:07:03 +08:00 |
|
Cocos Robot
|
7285dfc584
|
[ci skip][AUTO]: Automated genbindings update: d01d0d8f25bd376ca471ae8e48590d71a7c3645b (#4194) (#4196)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
|
2022-01-19 15:20:25 +08:00 |
|
troublemaker52025
|
324e722f30
|
shadow info mifration for v3.5.0 (#4194)
|
2022-01-19 13:47:45 +08:00 |
|
pandamicro
|
393bb3a3e7
|
Update metas (#10020)
|
2022-01-19 12:49:42 +08:00 |
|
江战
|
8154648490
|
3.4.1 Android: Java flush game thread tasks (#4193)
* fix run on game thread
* save
* just flush java tasks, do not run gameTick
* reduce timeout to 50
|
2022-01-19 12:40:20 +08:00 |
|
ChiaNing
|
0036ddba81
|
change sys.__isWebIOS14OrIPadOS14Env for iOS 14 (#10019)
|
2022-01-19 11:41:54 +08:00 |
|
pandamicro
|
1ed6b85579
|
Temporary fix for tiled map with custom nodes (#10017)
* Revert "use byteLength instead of byteCount in tiled-layer (#10008)"
This reverts commit 2d23a28b32.
* Temporary fix for shield node test case
|
2022-01-19 08:58:23 +08:00 |
|
pandamicro
|
be2b44748b
|
Improve mesh buffer for avoid iOS14 performance drop (#10015)
* Improve mesh buffer for avoid iOS14 performance drop
* Fix mesh buffer unit test
|
2022-01-18 23:13:20 +08:00 |
|
Leslie Leigh (李的序)
|
19c121dd07
|
Fix skeletal animation sample() does not work as intended (#10006)
* Fix skeletal animation sample() does not work as intended
* update
* currentClipRef -> currentClip
* Rename
* Optimize
* Internal
* Optimize
* Update
|
2022-01-18 22:56:10 +08:00 |
|
ChiaNing
|
59acd7eec7
|
sprite event off & fix renderData hash bug (#10012)
* event off
* fix renderData hash bug
|
2022-01-18 18:18:26 +08:00 |
|
ChiaNing
|
4397003da5
|
fix sprite rect bug (#10011)
|
2022-01-18 18:01:47 +08:00 |
|
Zhang mingzhen
|
9e63a71a87
|
remove deprecated (#10007)
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
|
2022-01-18 14:26:43 +08:00 |
|
zhakesi
|
2d23a28b32
|
use byteLength instead of byteCount in tiled-layer (#10008)
* use byteLength instead of byteCount in tiled-layer
* use byteLength to replace byteCount
|
2022-01-18 13:35:35 +08:00 |
|
kenshin
|
a608d90577
|
copy from https://github.com/cocos-creator/engine-native/pull/4170 (#4185)
|
2022-01-17 19:37:11 +08:00 |
|
ChiaNing
|
fea3f70dbc
|
protect meshBuffer max vertex count (#10005)
* protect meshBuffer max vertex count
* format change
|
2022-01-17 18:50:20 +08:00 |
|
ChiaNing
|
466a2dc97d
|
change macro for meshBuffer (#10001)
* change macro for meshBuffer
* name change
* test used name change
|
2022-01-17 16:09:49 +08:00 |
|
PP
|
6167bab1aa
|
fix touch event on IMAGE STENCIL mask component (#10000)
|
2022-01-17 14:03:09 +08:00 |
|
Zeqiang Li
|
9cd1fd911e
|
fix mem status (#4179)
|
2022-01-17 09:38:41 +08:00 |
|
zhakesi
|
22ef32a09f
|
fix TiledLayer's color setting (#9997)
|
2022-01-14 22:07:23 +08:00 |
|
zxx43
|
7c919215da
|
v3.4.1 Enable model after playing instead of onEnable (#9991)
* Enable model after playing instead of onEnable
* remove unused statements
|
2022-01-14 19:08:42 +08:00 |
|
Zeqiang Li
|
8b0c68504c
|
m1 deferred rendering issue: fbf & write to same tex not fully support (#4174)
Co-authored-by: lyeee <timelyeee@gmail.com>
|
2022-01-14 15:57:55 +08:00 |
|
PP
|
09f5a029ab
|
support EventDispatcherPriority (#9976)
* expect error requestPermission undefined
* support EventDispatcherPriority
* Revert "expect error requestPermission undefined"
This reverts commit fb08ba61987600c8a9237b4202dc46e22e298636.
* fix systemEvent touch event
* Revert "revert deprecate system event (#9941)"
This reverts commit d69d18dc7b.
* optimize code
|
2022-01-14 10:48:13 +08:00 |
|
GengineJS
|
940891f274
|
Fix the problem of deferred pipeline multi-execution transparent queue (#4168)
|
2022-01-14 09:39:20 +08:00 |
|