Max Chen
e4d4965491
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
Chris Gagnon
d7d4ee7b38
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
...
#rb none
#fyi Max.Chen, Tim.Gautier
[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
benn gallagher
b3689d31ac
Backout fix temporarily to fix robomerge: Fixed 4.23 Chaos defaulting to TaskGraph which is currently unimplemented. Now defaults to dedicated thread.
...
#jira UE-77827
#rb Martin.Wilson
#ROBOMERGE-SOURCE: CL 7605455 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)
[CL 7605456 by benn gallagher in Main branch]
2019-07-24 10:34:07 -04:00
benn gallagher
071e001cb3
Fixed 4.23 Chaos defaulting to TaskGraph which is currently unimplemented. Now defaults to dedicated thread.
...
#jira UE-77827
#rb Martin.Wilson
#ROBOMERGE-SOURCE: CL 7605403 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)
[CL 7605404 by benn gallagher in Main branch]
2019-07-24 10:28:00 -04:00
max whitehead
663c2c5f1f
Fix Chaos particles flagged as disabled still being in ActiveIndices array. Replace incorrect usages with Evolution's DisableParticle function.
...
Fix RigidParticle initializing Island to 0 instead of INDEX_NONE.
#jira UE-76243
#rb ori.cohen
#ROBOMERGE-SOURCE: CL 7308714 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)
[CL 7308716 by max whitehead in Main branch]
2019-07-15 10:33:10 -04:00
Max Chen
4561801a81
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
...
#rb none
[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Brice Criswell
e613c0198e
Added include for Paths.h
...
#jira UE-75964
#rb none
#fiy Michael.Lentine
[CL 6912746 by Brice Criswell in Main branch]
2019-06-10 13:02:51 -04:00
Jeff Fisher
bcc5bcf128
Copying //UE4/Dev-VR to Main (//UE4/Main)
...
-Copy up for 4.23
#rb none
[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Michael Lentine
f9b3324b32
Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
...
#rb none
#rnx
[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -04:00
