Commit Graph

9 Commits

Author SHA1 Message Date
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -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
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
ori cohen
71a27602ac Refactor evolution to allow type traits
#rb none
#jira nojira

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12921817 via CL 12921826 via CL 12921987 via CL 12921989 via CL 12922049
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12922068 by ori cohen in Main branch]
2020-04-20 09:47:13 -04:00
josh adams
8564e1b315 - Changes to various modules, plugins, programs, websites, thirdparty code, etc that had NotForLicensees folders within them, to move to Restricted
- Moved the AndroidDeviceProfileSelector secret guid to a NoRedist .ini setting
[CODEREVIEW] alistair.white,chris.babcock,jack.porter
#rb ben.marsh, advisor

#ROBOMERGE-SOURCE: CL 12706094 via CL 12709228 via CL 12709456
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12709555 by josh adams in Main branch]
2020-04-09 19:58:35 -04:00
satchit subramanian
67da38a73c Fix headless chaos compile.
#ROBOMERGE-SOURCE: CL 12095627 via CL 12095628 via CL 12095630 via CL 12095633
#ROBOMERGE-BOT: (v657-12064184)

[CL 12095640 by satchit subramanian in Main branch]
2020-03-09 17:56:24 -04:00
chris caulfield
ec9bf480e0 Chaos
- remove template parameters from Evolution classes
- remove EvolutionPGS

#rb none


#ROBOMERGE-SOURCE: CL 11445838 via CL 11445860 via CL 11445876
#ROBOMERGE-BOT: (v654-11333218)

[CL 11445883 by chris caulfield in Main branch]
2020-02-14 13:16:09 -05:00
michael lentine
a560ca1682 Rename/move HeadlessChaos.
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10942527 via CL 10942568 via CL 10942571 via CL 10942575
#ROBOMERGE-BOT: (v632-10940481)

[CL 10942576 by michael lentine in Main branch]
2020-01-10 12:41:31 -05:00