Andrew Davidson
|
3ddc3a4da3
|
Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none
[CL 16211417 by Andrew Davidson in ue5-main branch]
|
2021-05-05 15:07:25 -04:00 |
|
chris caulfield
|
0f2e2b75f4
|
Chaos - store CullDistance with Collision Constraint for use in Update
- fix early-out in collision Apply step
- add varying stiffness to Collision Apply
- fixed restitution for low stiffness
#rb jaco.vandyk
#jira none
#preflight 606391144bf1970001e054be
#ROBOMERGE-OWNER: chris.caulfield
#ROBOMERGE-AUTHOR: chris.caulfield
#ROBOMERGE-SOURCE: CL 15868496 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15868670 by chris caulfield in ue5-main branch]
|
2021-03-30 18:14:56 -04:00 |
|
Marc Audy
|
8f73cd7fa9
|
Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601
[CL 15631170 by Marc Audy in ue5-main branch]
|
2021-03-05 19:27:14 -04:00 |
|
Marc Audy
|
cac1fe0019
|
Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572
[CL 15299962 by Marc Audy in ue5-main branch]
|
2021-02-03 14:57:28 -04:00 |
|
Marc Audy
|
bc88b73a29
|
Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763
[CL 15158774 by Marc Audy in ue5-main branch]
|
2021-01-21 16:22:06 -04:00 |
|
Marc Audy
|
ada7c144fa
|
Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
|
2020-12-11 14:21:20 -04:00 |
|
Marc Audy
|
a7f9391231
|
Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117
For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer
[CL 14811440 by Marc Audy in ue5-main branch]
|
2020-11-24 18:42:39 -04:00 |
|
Marc Audy
|
68150e0be7
|
Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913
[CL 14612291 by Marc Audy in ue5-main branch]
|
2020-10-29 13:38:15 -04:00 |
|
Marc Audy
|
4c1bb11c29
|
Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck
[CL 14551026 by Marc Audy in ue5-main branch]
|
2020-10-22 19:19:16 -04:00 |
|
Marc Audy
|
50a3d7d368
|
Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes
[CL 14468207 by Marc Audy in ue5-main branch]
|
2020-10-09 22:42:26 -04:00 |
|