V3.4.0 #4
Merged
V3.4.0 #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # cocos/core/director.ts # cocos/core/global-exports.ts # package.json
merge V3.3.0
* framegraph, port from dpc * fix sspr bug in android + vulkan * Revert "fix sspr bug in android + vulkan" This reverts commit dc8fad8.
sync V3.3.0
* Modify the math library * fix ci
* Add dt threshold * Fix ci * Fix game.step and add time unit comments * Fix adjusted frame time
* fix spotlight shadow matrix, lineardepth, selfbias error (#8483) * Spotlight shadows: Added depthbias in viewspace units * Remove now unnecessary UBO constants * Add support for directional lights * fix spotlight shadow matrix, lineardepth, selfbias error (#8483) * Fix Spotlight light leaking in backface and compiling error * fix dirlightview matrix error * more accuracy for spotlight shadow bias * Fix face normal bias * Fix DirLight Soft/Soft2X * improve performance for ShadowUBO divid op * remove spotshadow linear mode(can't work with new shadow bias), fix spotshadow linear mode * fix spot shadow linear mode * directional light packing mode and disable linear mode * compiled effects Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com>
* Add easing method to quat curve * Update * Fix unit test * lint
sync V3.3.0
sync V3.3.1
* fix parsing asset's dependencies failed * refine
* mnior refactor * fix * stash * move register and init to engine inited event
* DeferredPipeline: enable shadowmap for main light * Update deferred-pipeline-scene-data.ts
Fix create new scene display error Fix RGBE macro not match with useIBL disabled
* Update bloom * Remove bloom pass for UI camera
* submit terrain lod and add terrain block visible property * rename some function and variable * Update indent * Fix ci * revert render callback * add render callback * resolve conflicting * resolve conflicting Co-authored-by: pandamicro <lphuabin@gmail.com>
* occlusion query * add supportQuery * fix name for occlusion query * remove redundant function Co-authored-by: lijilin <jilin.li@cocos.com>
Co-authored-by: pandamicro <lphuabin@gmail.com>
* Fix animation graph deserialize problem * Build warns
* Support module overrides without compiliation in dev mode * Update render-config.json
* fix custom material bug * change material default value
* Fix render-camera-to-model color display error Move materials to default-materials folder * rename
* Animation graph variable: rename number to float * Add name property to animation blend
* 0 fps * modify i18n in fbx editing (#71) Co-authored-by: 黄森斌 <arsen2010@126.com>
* optimize interface in screen module * remove DPR calculating * update screen-adapter init * set screen.resolutionScale as 1 by default * remove pixelRatio getter in system-info * remove sys.windowPixelRatio access * optimize screen.windowSize update * convertToCocosScreenSpace * change resolution-change to window-resize * fix native UI update update UI update UI * optimize screen init * fix subContextView * fix root resize * fix precision issue on Metal render end * sys.windowPixelRatio * use warnID * remove screen.convertToCocosScreenSpace * put private property and method together after public ones * warnID * fix landScape on CocosPlay * fix DPR on vivo platform * fix CI
This reverts commit 4735476.
zxx43
pushed a commit
that referenced
this pull request
Oct 18, 2022
zxx43
added a commit
that referenced
this pull request
Oct 18, 2022
* when checking useSystemFont, the fontFamily should appear (cocos#12684) Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com> * remove rebundant useLocalData (cocos#12640) (cherry picked from commit 7cca981) Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com> * Modify version number (cocos#12726) Co-authored-by: liuyi <liuyi@cocos.com> * fix builtin asset hot-reload (cocos#12736) * improve: move xr init to infrastructure (cocos#12765) * improve: move xr init to infrastructure * fix: move initxr, before gfx * fix: format warning * [Feature] build template add config file (cocos#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 (cocos#12760) * Wgpu 3.6.2 WGPU_CI_ON (cocos#12731) * fix okhttp onClosing not call close (cocos#12783) * fix transparency, emissive and specularfactor with dcc effects (cocos#12798) * reverse occlusion parameter in effects (cocos#12795) * [native] Fix getting wrong value of globals.ambient.skyLightingColor (cocos#12810) * refine: remove unneeded code (cocos#12808) * feat: update meta files (cocos#12807) * middleware2d components rendering in native mode (cocos#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: 88c3a7f (cocos#12788) (cocos#12818) Co-authored-by: cocos-robot <cocos-robot@cocos.com> * simplify (cocos#12782) * [code] move decode32 to unpack.chunk (cocos#12823) * [Optimize] Cache current time for audio player in minigame. (cocos#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 (cocos#12833) * update config * Update LogRemote.cpp * update default_skybox and sun direction (cocos#12811) * fix submeshes have different instancing options (cocos#12786) * [ci skip][AUTO]: Automated code generating update: 3200403 (cocos#12786) (cocos#12871) Co-authored-by: cocos-robot <cocos-robot@cocos.com> * spine/dragonbones support batch mode in web platform (cocos#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 (cocos#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 (cocos#12877) * fix:CC_ASSERT(!_currentApp.expired()); (cocos#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 (cocos#12865) * remove player when the audio source's clip is set to null * fix binary format spine load crash (cocos#12894) * wgpu: remove reinit on same object (cocos#12799) * add i18n for skybox (cocos#12899) * 3.6.2 fix android orientation crash (cocos#12885) * do not cache argument in global space * add doc * add a comment for readAttachment (cocos#12902) * If it is preview, replace overrideUuid directly (cocos#12905) * sort the attributes (cocos#12904) Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com> * add i18n for shadow (cocos#12906) * update default-skybox and sun direction (cocos#12917) * fix:WebSocket connection to 'ws://XXXX/' failed: A server must not mask any frames that it sends to the client. (cocos#12882) * remove USE_BATCHING (cocos#12892) * fix a native middleware blend problem (cocos#12914) * migrated remove USE_BATCHING (cocos#12895) * [feature] support output bullet.wasm on runtime based platform which the using of wasm api is more similar with weixin (cocos#12881) * V3.6.2 fix particle crash (cocos#12913) * fix native crash * revert to pointer * revert * do not use reference * if PREVIEW load cce scripts before loadProjectBundles (cocos#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 (cocos#12826) * Export texture info for wgpu WGPU_CI_ON (cocos#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 (cocos#12929) * richtext addChild optimization (cocos#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 (cocos#12900) * optimize label component editing * fix animation asset on inspector preview bug * optimize i18n break words * update node-executable by env (cocos#12930) * Fix: toDataURL is not supported for this content on iPhone 7p (cocos#12830) * Fix: toDataURL is not supported for this content on iPhone 7p * Add srgb transform. (cocos#12873) * add localCfg.cmake (cocos#12932) * _loadCCEScripts will be browser-preview only (cocos#12925) * _loadCCEScripts will be browser-preview only * add comment * a compatible way of data copy & default buffer size for uniform buffer (cocos#12935) * a compatible way of data copy & default buffer size for uniform buffer * update external config * [fix] default scene ambient and dirlight color (cocos#12955) * sync readme for wgpu (cocos#12966) * [fix] specularIntensity is invalid with builtin-standard (cocos#12971) * [native] type2writer:add FLOAT3 to Color case for compatiblity (cocos#12962) * V3.6.2 format return null error fix (cocos#12973) * add i18n for model (cocos#12985) * fix potential mem leak (cocos#12995) * [fix] camera clear flag is skybox but skybox is disabled cocos#13589 (cocos#12964) * [fix] shader compilation error with CC_DEVICE_SUPPORT_FLOAT_TEXTURE=0 (cocos#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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: cocos-creator/3d-tasks#
Changelog:
*