Commit Graph

224 Commits

Author SHA1 Message Date
Santy-Wang d400e5b296 Revert "sync v3.6.2 to develop" (#13027)
This reverts commit 23455e75c6.
2022-10-12 17:08:32 +08:00
Santy-Wang 23455e75c6 sync v3.6.2 to develop
* when checking useSystemFont, the fontFamily should appear (#12684)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* remove rebundant useLocalData (#12640)

(cherry picked from commit 7cca98171d765a32e8732ad01b994bc10e861314)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* Modify version number (#12726)

Co-authored-by: liuyi <liuyi@cocos.com>

* fix builtin asset hot-reload (#12736)

* improve: move xr init to infrastructure (#12765)

* improve: move xr init to infrastructure

* fix: move initxr, before gfx

* fix: format warning

* [Feature] build template add config file (#12701)

* part of build template add config json for creating build templates and version checks for each platform

* update default template version

* add RenderQueue custom ability to classic pipeline (#12760)

* Wgpu 3.6.2 WGPU_CI_ON  (#12731)

* fix okhttp onClosing not call close (#12783)

* fix transparency, emissive and  specularfactor with dcc effects (#12798)

* reverse occlusion parameter in effects (#12795)

* [native] Fix getting wrong value of globals.ambient.skyLightingColor (#12810)

* refine:  remove unneeded code (#12808)

* feat: update meta files (#12807)

* middleware2d components rendering in native mode (#12788)

* middleware2d components rendering in native mode

* support spine/dragonbones set enable batch

* support spine rendering in batching mode

* get batcher2d instance from root

* process about with type conversion

* fix some code style

* use material hash to merge draw batch

* deal with fill z

* fix dragonbones fill z

* remove some code no used any more

* refactoring some code

* modify some code

* add free memory

* fix clang-tidy

* delete mesh-buffer-layout in destructor

* byte alignment

* [ci skip][AUTO]: Automated code generating update: 88c3a7ffdd8f95cd2c7776d6d3d6a8e36862d0bf  (#12788) (#12818)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* simplify (#12782)

* [code] move decode32 to unpack.chunk (#12823)

* [Optimize] Cache current time for audio player in minigame. (#12814)

* Cache current time for minigames

* Save current time as private member

* Make cache time changed in callback

* update cache time to abort middle state for seek

* LogRemote upgrade configuration protocol (#12833)

* update config

* Update LogRemote.cpp

* update default_skybox and sun direction (#12811)

* fix submeshes have different instancing options (#12786)

* [ci skip][AUTO]: Automated code generating update: 3200403d155bbfbdef67440c48febc087ac1f0e5  (#12786) (#12871)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* spine/dragonbones support batch mode in web platform (#12847)

* spine/dragonbones support batch mode in web platform

* set data hash 0 in commitMiddleware

* optimizate merge draw batch for middleware

* keep commitIA in batcher2d

* modify deprecated about commitIA

* feat: support webgpu on build-engine (#12627)

* feat: support webgpu

* build-engine-feat: support building external asset

* update

* Publish @cocos/build-engine@4.4.0-webgpu.0

* fix tiled merge draw call with sprite (#12877)

* fix:CC_ASSERT(!_currentApp.expired()); (#12844)

application has destroyed when WebSocketServer process callback in game thread

* [Bug fix] remove the player of the audio source when its clip is set to null  (#12865)

* remove player when the audio source's clip is set to null

* fix binary format spine load crash (#12894)

* wgpu: remove reinit on same object (#12799)

* add i18n for skybox (#12899)

* 3.6.2 fix android orientation crash (#12885)

* do not cache argument in global space

* add doc

* add a comment for readAttachment (#12902)

* If it is preview, replace overrideUuid  directly (#12905)

* sort the attributes (#12904)

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* add i18n for shadow (#12906)

* update default-skybox and sun direction (#12917)

* fix:WebSocket connection to 'ws://XXXX/' failed: A server must not mask any frames that it sends to the client. (#12882)

* remove USE_BATCHING (#12892)

* fix a native middleware blend problem (#12914)

* migrated remove USE_BATCHING (#12895)

* [feature] support output bullet.wasm on  runtime based platform which the using of wasm api is more similar with weixin (#12881)

* V3.6.2 fix particle crash (#12913)

* fix native crash

* revert to pointer

* revert

* do not use reference

* if PREVIEW load cce scripts before loadProjectBundles (#12916)

* If it is preview, replace overrideUuid  directly

* load cce scripts before loadProjectBundles

* Update game.ts

* Update game.ts

* Update game.ts

* Update game.ts

* fix download url request not encode space (#12826)

* Export texture info for wgpu WGPU_CI_ON (#12926)

* export texture info for wgpu

* missing js file

* update external config

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>

* fix: build-engine (#12929)

* richtext addChild optimization (#12928)

* 1. remove rebundant invoking
2. ttf canvas texture resizes to width and height as (1,1)

* remove start() and move it to onLoad()

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>

* fix animation asset on inspector preview bug (#12900)

* optimize label component editing

* fix animation asset on inspector preview bug

* optimize i18n break words

* update node-executable by env (#12930)

* Fix: toDataURL is not supported for this content on iPhone 7p (#12830)

* Fix: toDataURL is not supported for this content on iPhone 7p

* Add srgb transform. (#12873)

* add localCfg.cmake (#12932)

* _loadCCEScripts  will be browser-preview only  (#12925)

* _loadCCEScripts  will be browser-preview only

* add comment

* a compatible way of data copy & default buffer size for uniform buffer (#12935)

* a compatible way of data copy & default buffer size for uniform buffer

* update external config

* [fix] default scene ambient and dirlight color (#12955)

* sync readme for wgpu (#12966)

* [fix] specularIntensity is invalid with builtin-standard (#12971)

* [native] type2writer:add FLOAT3 to Color case for compatiblity (#12962)

* V3.6.2 format return null error fix (#12973)

* add i18n for model (#12985)

* fix potential mem leak (#12995)

* [fix] camera clear flag is skybox but skybox is disabled #13589 (#12964)

* [fix] shader compilation error with CC_DEVICE_SUPPORT_FLOAT_TEXTURE=0 (#13015)

* fix import

* sync tojs to swig about middleware and 2d module (#4)

* sync tojs to swig about scene module (#5)

* remove Model::getInstancedAttributeBlock

Co-authored-by: Zhang mingzhen <32831993+Zhmz@users.noreply.github.com>
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
Co-authored-by: LIUYIa <102024185+LIUYIa@users.noreply.github.com>
Co-authored-by: liuyi <liuyi@cocos.com>
Co-authored-by: fqamic <fqamic@vip.qq.com>
Co-authored-by: minggo <nudtzxm@gmail.com>
Co-authored-by: changhua <39176194+changhua0118@users.noreply.github.com>
Co-authored-by: hyde zhou <zlzhou.sh@outlook.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>
Co-authored-by: James Chen <dumganhar@gmail.com>
Co-authored-by: bofeng-song <bofeng.song@chukong-inc.com>
Co-authored-by: 袁炜海 <35713518+dogodo-cc@users.noreply.github.com>
Co-authored-by: zhakesi <liqiao@cocos.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: timlyeee <43355299+timlyeee@users.noreply.github.com>
Co-authored-by: PP <chinese1236@qq.com>
Co-authored-by: oahc09 <oahc09@gmail.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com>
Co-authored-by: CC9701 <73738313+CC9701@users.noreply.github.com>
Co-authored-by: zxx43 <zxx43@hotmail.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: ycg <1670543365@qq.com>
Co-authored-by: AFeiYA <386665678@qq.com>
Co-authored-by: zhakesi <zhakesi@foxmail.com>
2022-10-12 16:56:06 +08:00
santy-wang f33523227f sync v3.6.1 to develop 2022-09-19 14:00:54 +08:00
江战 4947bb039a fix mac gradlew path (#12800) 2022-09-16 16:24:58 +08:00
santy-wang 7bbad4a0a4 Merge branch 'develop' of github.com:cocos-creator/engine into v3.6.1-sync 2022-09-14 11:47:58 +08:00
江战 d09c211cf9 V3.6.1 fix android path contains space on windows (#12754)
* fix android path

* fix Run windows build
2022-09-14 10:17:08 +08:00
minggo aba9fdb63f Merge branch 'v3.6.1' into merge_v3.6.1 2022-09-02 20:08:18 +08:00
江战 ca3acdd104 reduce warning (#12585) 2022-09-01 18:06:04 +08:00
Leslie Leigh (李的序) ebb775bfde Fix spine typing 3.6.x (#12402)
* Fix spine typing 3.6

* Update

* Fix

* Publish
2022-08-31 14:17:44 +08:00
mmyduckx 2ea6e9b148 Remove base node related logics (#11977) 2022-08-23 17:34:36 +08:00
minggo 834cfa66af Merge branch 'v3.6.1' into merge_v3.6.1 2022-08-23 14:13:02 +08:00
changhua c0a818a60c [Bug] fix huaweiagc not find platform template (#12385)
* fix build huawei-agc, not first time, can not find platformTemplate

* update

* update
2022-08-19 20:56:34 +08:00
minggo fa8d498eb0 Merge branch 'v3.6.1' into merge_v3.6.1 2022-08-18 13:32:34 +08:00
Leslie Leigh (李的序) 9ddae58790 Update scripts\native-pack-tool\xcode\package-lock.json (#12153) 2022-08-17 16:17:57 +08:00
Santy-Wang e6c74959b1 Merge pull request #12444 from cocos/v3.6.0
V3.6.0
2022-08-17 11:37:37 +08:00
timlyeee ca9c80146d append cmake argument as APP_NAME for all build phase on Windows (#12439) 2022-08-16 16:03:01 +08:00
PP ca26b205ba fix undefined mode for building separate-engine (#12365)
* fix undefined mode

* publish @cocos/build-engine@4.3.16

* optimize
2022-08-09 11:48:02 +08:00
minggo 5778aab354 Merge branch 'v3.6.0' into merge_v3.6 2022-08-08 10:49:46 +08:00
PP 84e91d36d3 fix undefined global constants (#12353)
* fix undefined global constants

* publish build-engine@4.3.15
2022-08-05 18:30:47 +08:00
minggo e0bfd1d380 Merge branch 'v3.6.0' into merge_v3.6 2022-07-26 12:01:26 +08:00
dependabot[bot] fbe7661598 Bump nanoid from 3.1.16 to 3.3.4 in /scripts/build-engine (#12060)
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.16 to 3.3.4.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.16...3.3.4)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-22 12:56:46 +08:00
PP 810de3fe68 support number type of engine constant (#12012)
* add constant type for number

* support number type of build time constant

* publish 4.3.11

* update test

* support genCCEnvConstants && publish 4.3.12

* NET_MODE is public, SERVER_MODE is private

* update deps

* fix exportDynamicConstants

* update test

* publish 4.3.14

* update deps

* support JIT is not dynamic

* update lock
2022-07-21 23:33:44 +08:00
changhua be279ac1cc fix huawei-agc can not find platformTemplate (#12079) 2022-07-21 21:13:14 +08:00
江战 97e8831910 add package-lock.json (#12110) 2022-07-21 14:23:54 +08:00
媛媛 7117ba4dd4 update native pack tool (#12113) 2022-07-21 11:58:42 +08:00
minggo d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
江战 ed03d0c8ca [Optimize] reduce size (#12004) 2022-07-15 11:03:38 +08:00
SijieWang 98bdb2d86b [Optimize] Clean up the file (#12001) 2022-07-14 22:03:52 +08:00
changhua c32b1da8f7 [Bug] install xcode dependencied (#11969) 2022-07-14 19:26:30 +08:00
changhua 1c55ce2ccf [Bug] throw error when building fail (#11999) 2022-07-14 19:23:51 +08:00
媛媛 08a6db1c33 [3.6.0] fix ohos make (#11942)
* add rawfilw dir

* fix res_path missing

* fix check java path
2022-07-12 16:04:35 +08:00
changhua b10a8c51c0 show failure after throw error on windows and ohos (#11862) 2022-07-05 21:20:08 +08:00
江战 0a71dc89de V3.6 fix warning log & space in path (#11851) 2022-07-05 15:41:01 +08:00
PP babbe9b269 use git clean -xfd to clear engine repo (#11771) 2022-07-02 15:59:46 +08:00
江战 6495789425 fix bug (#11734) 2022-06-29 09:56:47 +08:00
江战 cc090f1c95 fix mac/ios skip xcode update (#11675) 2022-06-27 14:18:40 +08:00
江战 79b928fe65 3.6 bugfix build template replace proj_name (#11654) 2022-06-22 17:57:25 +08:00
Leslie Leigh (李的序) c57953c380 Update build-consts.js (#11533) 2022-06-20 14:29:40 +08:00
PP c331c6c650 ban uglify adapter on xiaomi platform (#11609) 2022-06-20 13:34:17 +08:00
江战 247553577c auto create cocos-version.json (#11606) 2022-06-20 11:17:53 +08:00
江战 42c583665e 3.6 native template version validation (#11589) 2022-06-18 18:53:18 +08:00
SijieWang ffa3b578fd [Optimize] Native build output error (#11579) 2022-06-17 18:34:58 +08:00
江战 e8b9ec4a6f 3.6 Add warnning when skip_update_xcode_project not supported (#11517) 2022-06-15 16:39:25 +08:00
PP 4531e180b2 publish build-engine 4.3.10 (#11478)
* publish build-engine 4.3.9 && support native API docs

update lock

update

* publish 3.4.10: fix generating comment on top level of namespace

* fix test CI
2022-06-14 22:31:51 +08:00
PP 1c737b91fd optimize Constants in engine (#11464)
* publish build-engine 4.3.5

* update build-engine deps

* remove default-constants.ts

ds

remove de

* delete consts.d.ts

* support build-const workflow

* remove EXPORT_TO_GLOBAL

* update comment

* fix interface-check

* update comment
2022-06-14 16:14:34 +08:00
PP 7f889a1a78 support ConstantManager (#11392)
* support ConstantManager

update

* add unit test for ConstantManager

handle Escape in unit test

* fix `gulp build-h5-source`

* publish

* update deps

update lock

* update unit test

* merge ConstantManager into StatsQuery && merge cc.config.json

update

* make dynamic ccGlobal optional

* publish 4.3.2 and update deps

* export StatsQuery

* export some interface

* update deps
2022-06-10 13:35:46 +08:00
PP 5df66c1dd9 compile native adapter to target 'chrome 80' (#11428) 2022-06-09 13:36:25 +08:00
媛媛 85090a548a update native pack tools extends (#11416) 2022-06-09 09:23:48 +08:00
PP d65e8efe8b revert package-lock.json (#11422)
* revert to original lock file

* update

* Revert "ESLint Fix"

This reverts commit 5ad729903d810ae9847073dc4fe454a58709f1bf.
2022-06-08 22:40:56 +08:00
PP c0734c9420 downgrade lock (#11419)
* downgrade lock

* fix ci

* update lock
2022-06-08 20:50:30 +08:00