izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
180,637 Commits 23 Branches 254 Tags
e59338fcbb052d40802ffaf991924b2aebf04341
Commit Graph

8 Commits

Author SHA1 Message Date
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main 
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
 2021-01-08 19:56:07 -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
max whitehead
80008f1710 Fix build error with PhysX and Chaos, and IWYU. 
#rb none


#ROBOMERGE-SOURCE: CL 11887116 via CL 11887546 via CL 11887640
#ROBOMERGE-BOT: (v656-11643781)

[CL 11889792 by max whitehead in Main branch]
 2020-03-03 17:16:50 -05:00
max whitehead
19b76ff6e1 Remove PhysX module when using Chaos, Guard PhysX code in PHYSICS_INTERFACE_PHYSX so Chaos compiles without it. 
Change WITH_PHYSX to always be defined, even with chaos only.
Make Client/Server targets only disable PhysX when Chaos is enabled.
#rb michael.lentine


#ROBOMERGE-OWNER: max.whitehead
#ROBOMERGE-AUTHOR: max.whitehead
#ROBOMERGE-SOURCE: CL 11877480 via CL 11877967 via CL 11878038
#ROBOMERGE-BOT: (v656-11643781)

[CL 11888569 by max whitehead in Main branch]
 2020-03-03 17:06:00 -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
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
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
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