Commit Graph

5 Commits

Author SHA1 Message Date
fish9167 2210fad6b1 Chnage concurrency group (#11815)
Co-authored-by: jianping.yu <jianping.yu@cocos.com>
2022-07-01 19:19:10 +08:00
fish9167 89f51066d0 Change action triggers (#11773)
* [Change] change action event

* [Change] change action event

* [Change] change action event

* Update README.md

* Update README.md

Co-authored-by: jianping.yu <jianping.yu@cocos.com>
2022-06-30 16:05:17 +08:00
PP 4f990a58d1 fix interface-check workflow (#11447) 2022-06-10 10:33:23 +08:00
pandamicro 1446db89e7 Merge branch 'v3.4.2' into v3.5.0
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
2022-02-28 17:24:02 +08:00
James Chen f34301fb88 [3.5] Update ci yml files, add native/web prefix, cherry-pick from #10083 (#10104)
* Update ci yml files, add native/web prefix (#10083)

* Update ci yml files, add native/web prefix

* Update native-compile-platform.yml

* Update CMakeLists.header.txt & generate_compile_command_android.sh

* Fix wrong path in filter_by_cdb.js
2022-02-15 09:55:48 +08:00