Commit Graph

20 Commits

Author SHA1 Message Date
Marc Audy
c43360f47c Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#[fyi] Aurel.Cordonnier

#ushell-cherrypick of 18448630 by Marc.Audy
#preflight none

[CL 18483677 by Marc Audy in ue5-main branch]
2021-12-17 03:41:59 -05:00
aurel cordonnier
1ee4eed9aa Merge from Release-Engine-Test @ 17666640 to UE5/Main
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17668579 by aurel cordonnier in ue5-main branch]
2021-09-29 17:45:16 -04:00
aurel cordonnier
dc856801cd Merge from Release-Engine-Test @ 17059716 to UE5/Main
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17029914

[CL 17060422 by aurel cordonnier in ue5-main branch]
2021-08-04 17:46:20 -04:00
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
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Jerome Delattre
bb2dc9ba81 Gauntlet - Fix build installation issue with multiple clients test
by storing installation destination and returning the path to installation.

#jira none
#rb none
#rnx

[CL 15653907 by Jerome Delattre in ue5-main branch]
2021-03-09 09:36:11 -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
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -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
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
josh engebretson
33a301476b Gauntlet: fix issue with parallel tests copying servers/clients multiple times
#rnx
[FYI] ben.salem


#ROBOMERGE-SOURCE: CL 9317986 via CL 9318005 via CL 9318025 via CL 9318040 via CL 9318058
#ROBOMERGE-BOT: (v455-9298202)

[CL 9318092 by josh engebretson in Main branch]
2019-10-01 13:13:19 -04:00
Ben Marsh
81cf44002e Fix Gauntlet launching projects that have a space in the path.
#rb none
#fyi Andrew.Grant
#rnx

[CL 8179776 by Ben Marsh in Dev-Build branch]
2019-08-21 13:06:09 -04:00
ben salem
c553751aa7 Add the ability to declare additional artifact directories to copy over in addition to /saved/
#rb clayton.langford

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.salem
#ROBOMERGE-SOURCE: CL 6739909 via CL 6739922 via CL 6757015 via CL 6757271
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v365-6733468)

[CL 6762572 by ben salem in Dev-Build branch]
2019-06-01 11:14:55 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
2019-05-03 08:03:23 -04:00
andrew grant
505a8fd150 Added Win32 support to Gauntlet
Tests with EngineTest project

[at]josh.engebretson [at]ben.salem
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 6095648 via CL 6096480 via CL 6096540
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6122353 by andrew grant in Dev-Build branch]
2019-04-26 21:44:20 -04:00
Ben Marsh
84420696fe Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4830875 by Ben Marsh in Dev-Build branch]
2019-01-29 08:56:46 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Andrew Grant
1c70ebaa3f Moved platform files under Gauntlet/Platform and added conditional compilation
#rb none
#fyi ben.marsh
#lockdown Nick.Penwarden

[CL 4395415 by Andrew Grant in Main branch]
2018-09-25 12:22:42 -04:00