Commit Graph

85 Commits

Author SHA1 Message Date
aurel cordonnier
d17d20ca36 Merge from Release-Engine-Test @ 16758890 to UE5/Main
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
jonathan adamczewski
4ece24e65a AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

[CL 16648181 by jonathan adamczewski in ue5-main branch]
2021-06-11 18:20:44 -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
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -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
7a6219c6df Editgrate cl 15716397
Fix Gauntlet App package deployement on Mac. Utils.SystemHelpers.IsNetworkPath returns always true on Mac. Because Path.GetRootPath gives the same root for any path on unix based system.
Revert to use the GetVolumeName and comparing the names.

#jira UE-109554, UE-109939
#rb none
#rnx

[CL 15716506 by Jerome Delattre in ue5-main branch]
2021-03-16 18:59:51 -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
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
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
Chris Babcock
0cfc6e0653 Fix non-deterministic use of GetHashCode() in UBT and Gauntlet
#jira none
#review @Ben.Marsh
#rb Ben.Marsh
#rnx

[CL 15218197 by Chris Babcock in ue5-main branch]
2021-01-27 13:06:37 -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
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -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
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
andrew grant
65ec5074e4 Fix for Android builds not being discovered in Gauntlet
- Typo where when trying to remove 32-bit Android builds in favor of 64-bit builds we were setting them back to 32-bit.

#rb na
[FYI] josh.engebretson

#ROBOMERGE-SOURCE: CL 13062275 via CL 13062276 via CL 13062278 via CL 13062280
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13062281 by andrew grant in Main branch]
2020-04-28 21:21:57 -04:00
andrew grant
e89e3869ab Fixes Gauntlet support for 32-bit Android builds.
- Now use utils to pull build information instead of a custom regex.
- 32-bit builds are considered, but discarded if 64-bit versions are also present

[at]josh.engebretson
#jira nojira #rb na

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

[CL 11610034 by andrew grant in Main branch]
2020-02-25 13:05:03 -05:00
josh engebretson
b7c12a6fd3 Suppress zip64 warnings when processing IPA's
#rnx


#ROBOMERGE-SOURCE: CL 11177375 via CL 11177382 via CL 11177385
#ROBOMERGE-BOT: (v640-11091645)

[CL 11177389 by josh engebretson in Main branch]
2020-01-30 10:41:00 -05:00
ben salem
a80aaf82fc Add directory mappings for mac device to allow nonstandard file gathering plus pushing replays etc to the device.
#rb josh.engebretson


#ROBOMERGE-SOURCE: CL 11167909 via CL 11167921 via CL 11167923
#ROBOMERGE-BOT: (v640-11091645)

[CL 11168923 by ben salem in Main branch]
2020-01-29 17:05:51 -05:00
josh engebretson
0131c171e1 Updating ios-deploy
#rnx


#ROBOMERGE-SOURCE: CL 11063449 via CL 11063452 via CL 11063454
#ROBOMERGE-BOT: (v637-11041722)

[CL 11063457 by josh engebretson in Main branch]
2020-01-20 09:51:41 -05: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
daniel lamb
a06470aadb Gauntlet android build searching now correctly parses install directories.
Ben.Salem,Josh.Engebretson


#ROBOMERGE-SOURCE: CL 10613008 via CL 10613729
#ROBOMERGE-BOT: (v608-10590470)

[CL 10613832 by daniel lamb in Main branch]
2019-12-09 13:53:36 -05:00
andrew grant
8e51524156 Gauntlet - fixed exceptions that could occur when certain platforms don't exist on a system
[CODEREVIEW] josh.engbretson
#jira nojira
#rb na
#tests ran with & without Xbox & Switch folders present
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10481079 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v605-10478255)

[CL 10481080 by andrew grant in Main branch]
2019-11-29 21:00:10 -05:00