Commit Graph

14 Commits

Author SHA1 Message Date
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
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
ori cohen
5848053e1a Added traits to chaos solver.
#rb Benn.Gallagher

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 13008565 via CL 13009980 via CL 13009981
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13009989 by ori cohen in Main branch]
2020-04-23 13:44:21 -04:00
benn gallagher
5c655ca2c4 Reimplemented solver actors for Chaos geometry collections.
- Reimplemented TaskGraph tick mode to correctly handle multiple worlds (this involves ticking global command queues outside of world tick and mapping worlds to solver lists for each world tick so we can correctly handle multiple worlds)
 - Audited global commands that had an explicit solver capture and moved them to solver commands
 - Updated headless tests to new API for solver flags
#rb
#jira

#ROBOMERGE-SOURCE: CL 11604093 in //UE4/Release-4.25/... via CL 11604130
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11604166 by benn gallagher in Main branch]
2020-02-25 10:44:05 -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
ori cohen
00cd507766 Remove templates from TImplicitObjectUnion
#rb none


#ROBOMERGE-SOURCE: CL 10772414 via CL 10772421 via CL 10776585 via CL 10777791 via CL 10777857
#ROBOMERGE-BOT: (v610-10636431)

[CL 10777970 by ori cohen in Main branch]
2019-12-17 17:26:00 -05:00
marc audy
94548a8673 Change TBox to TAABB where we don't need the full generality
#rb none
[FYI] Ori.Cohen


#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 10611352 via CL 10611364 via CL 10613504
#ROBOMERGE-BOT: (v608-10590470)

[CL 10613506 by marc audy in Main branch]
2019-12-09 13:47:36 -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
ori cohen
5799e29c3c First pass removing T,d from Chaos. Only ImplicitObject
#rb none


#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 9944680 via CL 9944735
#ROBOMERGE-BOT: (v558-9892490)

[CL 9945739 by ori cohen in Main branch]
2019-10-31 17:28:08 -04:00
ori cohen
4cde9c8494 Move geometry type over to uint8 so we can easily use Instanced and Scaled
#rb none


#ROBOMERGE-SOURCE: CL 9872549 via CL 9872552
#ROBOMERGE-BOT: (v553-9872581)

[CL 9873728 by ori cohen in Main branch]
2019-10-28 16:29:43 -04: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
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
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