Commit Graph

13 Commits

Author SHA1 Message Date
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
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
ori cohen
22879e453d Remove chaos include guard macros
#rb none

#ROBOMERGE-SOURCE: CL 12672568 via CL 12672588 via CL 12672602 via CL 12672607
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12672626 by ori cohen in Main branch]
2020-04-08 10:19:29 -04:00
ori cohen
e4a7a7d199 Add temp guards for chaos header includes
[FYI] Chris.Caulfield
#rb none

#ROBOMERGE-SOURCE: CL 12558640 via CL 12558650 via CL 12558752 via CL 12558774 via CL 12560025
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12560214 by ori cohen in Main branch]
2020-04-02 14:18:06 -04:00
ori cohen
7ad6a77aa7 Add lvl1 header include (result of script)
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12510784 via CL 12510899 via CL 12510908 via CL 12510913
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12510925 by ori cohen in Main branch]
2020-04-01 16:28:03 -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
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