Commit Graph

34 Commits

Author SHA1 Message Date
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
robomerge
25ce51a063 Hooked up geometry collection to new SQ structures. GT dynamic collection now attached a TGeometryParticle array to store external geometry and transform for queries. Rotated Geometry Collection DDC key to fix previous serialization breakage.
#rb none
#jira
[FYI] Ryan.Kautzman, Brice.Criswell

#ROBOMERGE-SOURCE: CL 12063680 in //UE4/Release-4.25/... via CL 12063684
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076570 by robomerge in Main branch]
2020-03-09 13:22:54 -04:00
ryan kautzman
d64c4b88bb Fix CIS.
[FYI] Marc.Audy, Michael.Lentine
#rb: none
#jira: UE-89409

#ROBOMERGE-SOURCE: CL 12026168 in //UE4/Release-4.25/... via CL 12026175
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 12026194 by ryan kautzman in Main branch]
2020-03-06 18:17:16 -05:00
ryan kautzman
f06e7a4943 Remove the DynamicCollection from the geometry collection's FSimulationParameters. Make the GameThreadCollection on the FGeometryCollectionPhysicsProxy a reference to a collection passed to the constructor. So, the game thread dynamic collection is now owned outside of the proxy. Fixes the RigidBodies_SingleFallingUnderGravity test.
[FYI] Brice.Criswell, Michael.Lentine, Benn.Gallagher, Bill.Henderson
#rb: none
#jira: none

#ROBOMERGE-SOURCE: CL 11970038 in //UE4/Release-4.25/... via CL 11970122
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11980319 by ryan kautzman in Main branch]
2020-03-05 21:21:50 -05:00
brice criswell
165219a81a Chaos : Destruction
-Removed cross collection clustering initialization support.
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 11847312 in //UE4/Release-4.25/... via CL 11847327
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11847338 by brice criswell in Main branch]
2020-03-02 17:05:51 -05:00
Ryan Kautzman
4e412aabdd Merge 11257801 to Release-4.25.
Get clustering building with handles - preliminary checkin.

[FYI] Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: Ryan.Kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 11555717 in //UE4/Release-4.25/... via CL 11555721
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579493 by Ryan Kautzman in Main branch]
2020-02-21 17:40:37 -05:00
devon penney
c5ffda9a7b fix render bounds for geometry collection
from //UE4/Private-Reverb
#rb none


#ROBOMERGE-SOURCE: CL 11555348 via CL 11555351
#ROBOMERGE-BOT: (v654-11333218)

[CL 11555358 by devon penney in Main branch]
2020-02-19 17:10:11 -05:00
benn gallagher
2dfd80a0cd Reorder geometry collection commands and fix bad captures causing solver actor crashes.
#rb none
#jira


#ROBOMERGE-SOURCE: CL 11497707 via CL 11497717
#ROBOMERGE-BOT: (v654-11333218)

[CL 11497722 by benn gallagher in Main branch]
2020-02-18 08:28:50 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
ryan kautzman
45e7a25006 Get acces to the solver via GetPhysicsScene()->GetSolver() rather than GetOwner()->GetWorld()->PhysicsScene_Chaos->GetSolver(), because PhysicsScene_Chaos is no longer being initialized.
[FYI] Michael.Lentine, Jim.VanAllen, Brice.Criswell, Devon.Penny
#rb: Brice.Criswell


#ROBOMERGE-SOURCE: CL 10996039 via CL 10996044
#ROBOMERGE-BOT: (v633-10983880)

[CL 10996051 by ryan kautzman in Main branch]
2020-01-15 14:42:19 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Ryan Kautzman
0545196aba Get access to the solver via GetPhysicsScene()->GetSolver() rather than GetOwner()->GetWorld()->PhysicsScene_Chaos->GetSolver(), because PhysicsScene_Chaos is no longer being initialized.
#fyi Brice.Criswell, Michael.Lentine
#rb Brice.Criswell

[CL 10780095 by Ryan Kautzman in Main branch]
2019-12-17 17:53:02 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
michael lentine
ec8aeb4cd9 Fix fields for geometry collections.
#rb Benn.Gallagher, Ryan.Kautzman
#jira ue-84808
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10479354 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v605-10478255)

[CL 10479364 by michael lentine in Main branch]
2019-11-28 23:50:13 -05:00
Benn Gallagher
d118912346 Fixed collisions on geometry collections and make them exist in the actual world solver so they can interact.
#rb none
#jira UE-84918
#lockdown nick.penwarden

#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10367302 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10367316 by Benn Gallagher in Main branch]
2019-11-22 05:24:36 -05:00
benn gallagher
2633bedd01 Reimplemented detecting when an object should go dynamic for geometry collections
Push the correct results out to the scene proxy
Fixed crash handling game->phys data transition
#rb none
#jira UE-84804
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10321979 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)

[CL 10321985 by benn gallagher in Main branch]
2019-11-20 13:24:55 -05:00
ryan kautzman
a8b88645a9 Hacking at GeometryCollection debug drawing, trying to replace the int32 rigid body id with a FGuid. It's not there yet, but this change gets things building.
[FYI] Brice.Criswell, Michael.Lentine
#rb: Brice.Criswell
#jira: none

#ROBOMERGE-SOURCE: CL 10089571 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10090379 by ryan kautzman in Main branch]
2019-11-08 19:47:41 -05:00
Benn Gallagher
ea08a4feb7 Removed T from TChaosPhysicsMaterial. Rename to FChaosPhysicsMaterial. Clean up old code in Defines.h
#rb none
#jira


#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10054737 via CL 10054742 via CL 10054751
#ROBOMERGE-BOT: (v565-10026848)

[CL 10054933 by Benn Gallagher in Main branch]
2019-11-06 08:55:27 -05:00
michael lentine
acbc579509 Copy from //Fortnite/Dev-Physics
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 9374650 via CL 9374665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9385990 by michael lentine in Main branch]
2019-10-02 17:27:26 -04:00
Michael Lentine
8c9b69ff63 Fix endplay signature
#rb none
#jire ue-80235

[CL 8696062 by Michael Lentine in Main branch]
2019-09-16 13:42:25 -04:00
marc audy
bfe200fee4 Fixup engine code misusing GetComponentsByClass
#jira UE-79819
#rnx


#ROBOMERGE-SOURCE: CL 8503325 via CL 8503764
#ROBOMERGE-BOT: (v406-8472469)

[CL 8509323 by marc audy in Main branch]
2019-09-05 15:45:24 -04:00
Michael Lentine
e1323af3e6 Fix CIS.
#rb none
#jira ue-78210

[CL 8091463 by Michael Lentine in Main branch]
2019-08-16 11:28:08 -04:00
Benn Gallagher
3a4873ef60 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 7703071
#rb
#rnx

[CL 7705805 by Benn Gallagher in Main branch]
2019-08-02 09:01:58 -04:00
eric soulvie
2a45377720 wrap FColorEdit with WITH_EDITOR #jira UE-77821 #rb trivial
#ROBOMERGE-SOURCE: CL 7610192 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7610195 by eric soulvie in Main branch]
2019-07-24 13:04:02 -04:00
eric soulvie
a06b83370e BoneSelection and Highlighted bones reset on GC Componenet registration.
Fixed some metadata capitalization.
#jira UE-76699
#rb none
[FYI] michael.lentine

#ROBOMERGE-SOURCE: CL 7575261 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7575285 by eric soulvie in Main branch]
2019-07-23 16:27:55 -04:00