aurel cordonnier
25a11deeac
Merge from Release-Engine-Staging @ 16579919
...
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576
[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-07 20:09:45 -04:00
Zhenglin Geng
7436ff65c1
Remove ClearKinematicTarget
...
#rb trivial
#jira FROST-2992
#fyi brice.criswell, bill.henderson
[CL 16559750 by Zhenglin Geng in ue5-main branch]
2021-06-04 12:40:22 -04:00
Chris Caulfield
f15a108884
Chaos - wire SetConstraintFrames from game thread to physics thread
...
(Note: works in BeginPlay or Tick, but not from construction script yet)
#rb cedric.caillaud,brice.criswell,zhenglin.geng
#jira none
#preflight 60b0394e63fc6e000137e186
[CL 16510057 by Chris Caulfield in ue5-main branch]
2021-05-31 13:50:42 -04:00
aurel cordonnier
43fa62fcd8
Merge from Release-Engine-Test @ 16487383 to UE5/Main
...
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526
[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
cedric caillaud
992036110d
Fix to make PS5 build when LWC is on
...
#jira none
#fyi andrew.davidson
[CL 16443970 by cedric caillaud in ue5-main branch]
2021-05-24 22:21:49 -04:00
aurel cordonnier
8eebe8841f
Merge UE5/RET @ 16305968 to UE5/Main
...
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937
[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04:00
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
aurel cordonnier
50944fd712
Merge UE5/RES @ 16162155 to UE5/Main
...
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156
[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Benn Gallagher
0f24902964
Chaos - Change main scene substepping to run external to the solver update loop, unifying the process with async mode for the dispatch of substeps so we end up with correctly interpolated input forces when substepping. We still support internal substepping for other use cases in the short term (RBAN) until such time they can also be unified.
...
Included unit test for edge case where we sleep an object somewhere in the update before the end of the batch of substeps to make sure we correctly collapse the result queue before updating the game thread
#rb Ori.Cohen
#jira UE-113173
#lockdown Nick.Whiting
#preflight 607049e835bf8c00010ed3bb
#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 15966981 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15984566 by Benn Gallagher in ue5-main branch]
2021-04-12 18:47:39 -04:00
Benn Gallagher
bdb7cf113f
Chaos Physics: When changing from Kinematic to Dynamic and vice versa make sure that the velocities are reset.
...
#rb Benn.Gallagher
[FYI] Michael.Lentine, Benn.Gallagher
#jira UE-99744
#lockdown nick.whiting
[at]Benn.Gallagher
#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: jaco.vandyk
#ROBOMERGE-SOURCE: CL 15952965 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15967119 by Benn Gallagher in ue5-main branch]
2021-04-09 09:45:06 -04:00
Benn Gallagher
cb4566369d
Chaos - Add maximum linear and angular speeds per-particle. Default linear limit to float max, angular speed is configured by project settings
...
#rb Jaco.VanDyk
#jira UE-101477
#preflight 606c500e52aa0800010d78b1
#lockdown Nick.Whiting
#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 15930001 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15930423 by Benn Gallagher in ue5-main branch]
2021-04-06 10:45:16 -04:00
brandon dawson
210b8130df
Undo //UE5/Release-5.0-EarlyAccess/Engine/Source/Runtime/... changelist 15897108
...
#rb
[FYI] Zhenglin.Geng,Nick.White
#ROBOMERGE-SOURCE: CL 15903874 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
[CL 15907207 by brandon dawson in ue5-main branch]
2021-04-02 20:18:17 -04:00
zhenglin geng
1735e7fa08
SetKinematicTarget_AssumesLocked only sets Target transform.
...
Set Previous trasform in FSingleParticlePhysicsProxy::PushToPhysicsState.
This solves the loss of momentum issue.
#rb chris.caulfield
#jira none
#ushell-cherrypick of 15896966 by zhenglin.geng
#ROBOMERGE-OWNER: zhenglin.geng
#ROBOMERGE-AUTHOR: zhenglin.geng
#ROBOMERGE-SOURCE: CL 15896858 in //UE4/Release-4.26-Chaos/... via CL 15897108
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15897148 by zhenglin geng in ue5-main branch]
2021-04-01 18:13:00 -04:00
mark lintott
11a12136ce
#jira UE-111647
...
#rb johan.torp
GetLinkerUE4Version renamed to GetLinkerUEVersion
#ROBOMERGE-SOURCE: CL 15859222 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
[CL 15859586 by mark lintott in ue5-main branch]
2021-03-30 06:44:49 -04:00
Marc Audy
0cbbc781ca
Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
...
This represents UE4/Main @ 15709114
[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
benn gallagher
edf9d6ff24
Change UE4 reference in util comment
...
#rb trivial
#jira UE-111140
#ROBOMERGE-SOURCE: CL 15737528 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)
[CL 15738281 by benn gallagher in ue5-main branch]
2021-03-18 11:30:35 -04:00
chris caulfield
8832c43190
Merge from UE4
...
Chaos - particle counters
#jira none
#rb none
#preflight 604fdc43ef8d0e000169b08a
#ROBOMERGE-SOURCE: CL 15703893 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)
[CL 15703943 by chris caulfield in ue5-main branch]
2021-03-15 19:26:59 -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
benn gallagher
20652fedb3
Fixed radial impulse application to take into account the velocity change flag.
...
#rb Jaco.VanDyk
#jira UE-104907
#ROBOMERGE-SOURCE: CL 15583893 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)
[CL 15583899 by benn gallagher in ue5-main branch]
2021-03-03 12:28:33 -04:00
cedric caillaud
fe59e52c87
Chaos Physics - Add the ability to disable/enable rigid bodies from a skeletal simulation
...
#jira FROST-1108
#rb ori.cohen, max.whitehead, chris.caulfield, brice.criswell
[CL 15524293 by cedric caillaud in ue5-main branch]
2021-02-24 20:32:57 -04:00
Marc Audy
9753392e2b
Merge UE5/RES CL# 15462083 to UE5/Main
...
This represents UE4/Main @ 15414221
[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
benn gallagher
b360c7bc99
Removed warning attempting to get scene for null actor reference. This is actually a valid case that simplifies scene locking. When creating constraints with the world one actor will be null and the rest of the API handles this gracefully. For an example see FBodyInstance::CreateDOFLock.
...
#rb Jaco.VanDyk
#jira UE-107375
#ushell-cherrypick of 15375607 by Benn.Gallagher
#ROBOMERGE-SOURCE: CL 15395387 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)
[CL 15395394 by benn gallagher in ue5-main branch]
2021-02-11 21:36:53 -04:00
benn gallagher
fc0c080cab
static analysis fix merge
...
#rb trivial
#jira UE-107939
#ROBOMERGE-SOURCE: CL 15378466 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)
[CL 15381343 by benn gallagher in ue5-main branch]
2021-02-10 17:41:44 -04:00
chris caulfield
632aa725d0
Chaos - merging various fixes that missed the main merge deadline
...
#rb none
#jira none
#ROBOMERGE-SOURCE: CL 15347037 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)
[CL 15359396 by chris caulfield in ue5-main branch]
2021-02-08 15:59:34 -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
