Leslie Leigh (李的序)
62d695c04e
Suppress warns when baking skeletal curves in AnimationClip ( #9147 )
2021-08-06 16:03:04 +08:00
zxx43
aae27fa5df
fix trail bug ( #9121 )
...
* fix trail loop bug
* fix range bug & use loop count & fix native ubo update bug
* add trail delay
2021-08-06 15:34:11 +08:00
Myway
5efab6d032
fix terrain brush pass error by material gc ( #9125 )
...
Co-authored-by: Myway3D1 <404793124@qq.com >
2021-08-06 15:30:59 +08:00
troublemaker52025
c0c1c0313f
update light luminance name for v3.3.0 ( #9142 )
...
* update light luminance name for v3.3.0
* update
* add deprecated
* update
* update
* fix ci error
* update
* update
* update
2021-08-06 15:09:25 +08:00
Santy-Wang
63353c20d5
misc fixes ( #9143 )
...
* misc fixes
* refine
2021-08-06 15:06:04 +08:00
troublemaker52025
977c19dd1e
Fix mat world it nan v3.3.0 ( #9133 )
...
* fix MatWorldIT will be used Nan for v3.3
* update
2021-08-06 13:08:21 +08:00
lawrence-liuyue
fbd92ab01f
apply deferred pipeline to Framegraph ( #9083 )
...
* framegraph, port from dpc
* fix sspr bug in android + vulkan
* Revert "fix sspr bug in android + vulkan"
This reverts commit dc8fad8bc8aec686888ec176d97809a102223a42.
2021-08-06 12:01:41 +08:00
pandamicro
79a991adad
Merge pull request #9146 from cocos-creator/v3.3.0
...
merge V3.3.0
2021-08-06 12:01:16 +08:00
江战
60e7c2f2ab
3.3 auto select bind port ( #3803 )
2021-08-06 11:45:37 +08:00
timlyeee
e0126cae98
Update config.json ( #3804 )
2021-08-06 11:44:44 +08:00
黄森斌
6c53d88327
V3.3.0 add scene-2d template for 2d project ( #9145 )
...
* add scene-2d template
* Update editor/assets/default_file_content/ts
Co-authored-by: SijieWang <itharbors@outlook.com >
Co-authored-by: SijieWang <itharbors@outlook.com >
2021-08-06 11:28:46 +08:00
pandamicro
860be89d3f
Merge branch 'develop' into v3.3.0
2021-08-06 10:03:34 +08:00
timlyeee
b9ed0af4fa
Fix glslang errors and Edit-box errors ( #3802 )
...
* Update cmake list for dynamic library update
* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra
* small optimize gulp
* change config
* Update cmake list for dynamic library update
* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra
* add glslang header
* Revert "Update cmake list for dynamic library update"
This reverts commit 5eceb132c2411d7e479f6744e33048fabaafe780.
* fix rebase error
2021-08-05 17:22:46 +08:00
lawrence-liuyue
bd98d04639
Framegraph ( #3713 )
...
* framegraph, port from dpc
* enable frame graph in deferred pipeline
* apply framegraph in deferred pipeline, compile completed
* apply framegraph in deferred pipeline, compile completed
* debug framegraph
* debug sspr
debug sspr
* debug sspr
debug sspr
* port from liuhang
* apply uiphase
* fix CI bugs
* Delete jsb_pipeline_auto.cpp
* Delete jsb_pipeline_auto.h
* Revert "Delete jsb_pipeline_auto.h"
This reverts commit 224b1df83d3d69e65846ff2ca11ce8b804205c84.
* Revert "Delete jsb_pipeline_auto.cpp"
This reverts commit 16cb80ac7a7c5196c711261edd537555eff42da1.
* jsb_pipeline_auto
* fix clangtidy
* fix clangtidy
* fix clang-tidy
* fix clang-tidy
* add comments in Deferredpipeline.h
* Update pipeline.ini
* add transparent pass, add depth in postprocesspass
* fix compile error in mac/android
* Update LightingStage.cpp
* fix render tager bugs
* delete useless code
* fix clang-tidy
* fix viewport bugs in gles
2021-08-05 16:23:59 +08:00
mmyduckx
7686705eeb
remove jsb_module-register.cpp from native ( #3776 )
2021-08-05 16:14:53 +08:00
江战
c94f71b9be
pause tick before create surface ( #3801 )
2021-08-05 16:06:07 +08:00
江战
a6949bc6ec
Use float64 on non-JSB platforms ( #9111 )
...
* use float64 on non-jsb'
platforms
* simplify
* fix arg
2021-08-05 15:24:47 +08:00
PP
829a9eb409
use jest.expect().toBeCloseTo() interface ( #9140 )
2021-08-05 14:56:41 +08:00
ChiaNing
61d9a25776
Fix requireBuffer bug ( #9131 )
...
* Fix requireBuffer bug
* fix _recreateMeshBuffer twice bug
2021-08-05 12:00:14 +08:00
cary
6d0c8d2537
Fix the animation bug of vec2. ( #9123 )
2021-08-05 11:28:51 +08:00
cary
99557044f2
Remove preload for deferred pipeline material. ( #9117 )
2021-08-05 11:25:18 +08:00
zhakesi
c35120b2bf
fix:avoid animation's name not be a string type ( #9114 )
2021-08-05 11:17:45 +08:00
媛媛
7801987f7f
fix missing class report ( #9137 )
2021-08-05 11:00:39 +08:00
Leslie Leigh (李的序)
a40115e6d7
Unify animation event interfaces ( #9101 )
...
* Unify animation event interfaces
* update event edit (#27 )
# Conflicts:
# editor/inspector/assets/fbx/event-editor/editor.js
Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com >
2021-08-05 10:58:24 +08:00
媛媛
2f8c25ceff
Add speed option to fbx interface ( #9119 )
2021-08-05 10:57:25 +08:00
PP
4bc595974e
fix cannot read property '_uiProps’ of null ( #9127 )
2021-08-05 10:56:21 +08:00
PP
b2bed360ca
optimize system event type ( #9130 )
...
* support event callback type
update
* optimize eventKeyboard.keyCode type
* update
* update
2021-08-05 10:48:50 +08:00
troublemaker52025
df87653510
fix WebGL Unsupported Format,convert to WebGL format failed for v3.2.1 ( #9134 )
2021-08-04 23:00:36 +08:00
Santy-Wang
1d2f42e26b
use end_of_frame instead of after_draw in run scene ( #9135 )
2021-08-04 18:54:33 +08:00
minggo
4162cab9ac
Merge pull request #3798 from minggo/merge_v3.3.0
...
Merge v3.3.0
2021-08-04 17:44:01 +08:00
Leslie Leigh (李的序)
b2f8f5aa10
Fix a kind of easing method migration bug ( #9132 )
2021-08-04 17:07:27 +08:00
minggo
a61b2931dc
merge v3.3.0 and fix conflict
2021-08-04 16:43:35 +08:00
PP
d916165d85
optimize hide show event implamentation on minigame / runtime platform ( #9093 )
...
* fix hide show event on runtime platform
* remove legacy adapter on minigame platform
update
2021-08-04 16:16:36 +08:00
ChiaNing
b4d2b3e7c1
fix canvas off bug ( #9128 )
2021-08-04 16:09:22 +08:00
Santy-Wang
400fa5bbc8
fix demo exception ( #9129 )
2021-08-04 15:58:57 +08:00
ChiaNing
48bf90d61d
fix canvas targetTexture bug ( #9116 )
...
* fix canvas targetTexture bug
* resize camera by event
* name change
2021-08-04 12:01:55 +08:00
媛媛
5e548337e0
[3.3-2] Fix some event edit bugs ( #9090 )
...
* fix add event params failed
* fix new clips edit event
* update
* 修复 fbx 面板与动画编辑器事件编辑同步
2021-08-04 11:41:57 +08:00
jiaxin.lai
502deafb8c
fix physx contact event ( #3790 )
...
* fix physx contact event
2021-08-04 11:22:21 +08:00
Leslie Leigh (李的序)
3a52b35f3c
Optimize CCON related messages ( #9122 )
2021-08-04 10:02:53 +08:00
Santy-Wang
9372754099
handle effect asset update in editor ( #9118 )
...
* handle effect asset update in editor
* refine
* refine
2021-08-03 15:11:24 +08:00
Cocos Robot
c19c0eafa9
[ci skip][AUTO]: updating jsbinding automatically: 7becb0ae ( #3796 )
...
Co-authored-by: cocos-robot <engine-deploy@cocos.com >
2021-08-03 14:19:09 +08:00
江战
5f5a65797e
3.3 android appname ( #3793 )
...
* update android appname
* change build dir
* update template
2021-08-03 13:57:39 +08:00
GengineJS
7becb0aecc
update scene.ini ( #3794 )
2021-08-03 13:55:01 +08:00
PP
c8be11cdc4
add view module test ( #9120 )
...
update
2021-08-03 13:53:46 +08:00
Leslie Leigh (李的序)
5b41c11fc7
Update asset metadata ( #9110 )
2021-08-03 10:26:38 +08:00
cary
0d474c6362
Fix the action error reported for physical scenes. ( #9102 )
2021-08-02 17:37:05 +08:00
GengineJS
950518c251
Fix the incorrect ModelBounds of BakedSkinningModel ( #9113 )
2021-08-02 17:06:42 +08:00
GengineJS
d4a7f06068
Fix the incorrect ModelBounds of BakedSkinningModel ( #3791 )
2021-08-02 17:06:35 +08:00
Leslie Leigh (李的序)
6caef7a407
Fix AnimationClip.prototype.hash ( #9109 )
2021-08-02 13:41:08 +08:00
GengineJS
da05275968
Fix the problem that mainlight cannot be closed ( #9104 )
2021-08-02 10:32:55 +08:00