Commit Graph

6488 Commits

Author SHA1 Message Date
Ben Marsh
f6564eb124 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 8194620 by Ben Marsh in Dev-Build branch]
2019-08-21 16:28:23 -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
josh engebretson
e5ad433ea6 Gauntlet: Fix issue with Android saved path (verified adb version unrelated)
#rnx
[FYI] justin.marcus, clayton.langford

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 8119240 via CL 8119242 via CL 8123045 via CL 8124771
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8165926 by josh engebretson in Dev-Build branch]
2019-08-21 10:15:40 -04:00
josh engebretson
250c50d3ce Formalize test report generation data path
#rnx
[FYI] ben.salem, clayton.langford, william.ewen

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 8117729 via CL 8120876 via CL 8120936
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8164142 by josh engebretson in Dev-Build branch]
2019-08-21 10:06:11 -04:00
daniel lamb
312c726d4f Fix issue with missing -IOS on Code only buildversions inside the manifest.
Leigh.Swift

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 8117708 via CL 8117711 via CL 8120869 via CL 8120935
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8164134 by daniel lamb in Dev-Build branch]
2019-08-21 10:06:09 -04:00
justin marcus
60610d1b81 Optional paks are now contained in their own install bundles instead of using optional tag sets.
[at]Daniel.Lamb [at]Thomas.Ross


#ROBOMERGE-SOURCE: CL 8129730 via CL 8129735 via CL 8133455
#ROBOMERGE-BOT: (v401-8057353)

[CL 8159454 by justin marcus in Main branch]
2019-08-21 09:27:39 -04:00
andrew grant
3e9c14550d Fixed issue with missing arguments to UHT
#rb mike.beach


#ROBOMERGE-SOURCE: CL 8126941 via CL 8126947 via CL 8132331
#ROBOMERGE-BOT: (v401-8057353)

[CL 8157562 by andrew grant in Main branch]
2019-08-21 09:03:32 -04:00
altair lane
506a7e92ab Fix build error when using the BuildCook process.
#RB Ben.Marsh
[at]David.Hamm, [at]Mike.Beach, [at]Ben.Marsh
#RNX


#ROBOMERGE-SOURCE: CL 8126472 via CL 8126473 via CL 8132112
#ROBOMERGE-BOT: (v401-8057353)

[CL 8157154 by altair lane in Main branch]
2019-08-21 08:57:50 -04:00
andrew grant
37fb17cbda Fixed issue running ElementalDemo on Mac under Gauntlet
#jira nojira
#rb na
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8114300 in //UE4/Release-4.23/... via CL 8114314
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8152511 by andrew grant in Dev-Build branch]
2019-08-20 23:34:48 -04:00
jack porter
a51262a359 Prevent iOS Xcode project generation from adding a default bundle identifier to the UE4.xcodeproj file which caused issues with Blueprint projects on Mac.
#jira UE-77015
#rb Josh.Adams
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 8113618 in //UE4/Release-4.23/... via CL 8113621
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8152485 by jack porter in Dev-Build branch]
2019-08-20 23:34:43 -04:00
nick shin
078f459384 HTML5 Mac shipping linker error fix
#jira UE-78966  HTML5 code projects fail to package for Shipping configuration from Mac
#rb none
[RN]
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 8111079 in //UE4/Release-4.23/... via CL 8111080
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8150816 by nick shin in Dev-Build branch]
2019-08-20 23:24:23 -04:00
ben woodhouse
fe3ff0d2e9 PerfReportTool 3.86
Fix a bug with event names in event summaries getting truncated by 1 character in some cases

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 8095828 via CL 8096832 via CL 8096844
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8146254 by ben woodhouse in Dev-Build branch]
2019-08-20 23:04:16 -04:00
josh engebretson
bbaf83e334 Gauntlet: avoid port/beacon collisions when running multiple instances of UAT
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 8091223 via CL 8091415 via CL 8096067 via CL 8096173
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8145021 by josh engebretson in Dev-Build branch]
2019-08-20 22:59:23 -04:00
bob tellez
2963bf534f Back out changelist 8061173. Possible cause of EdTest timeout
[FYI] Josh.Engebretson

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 8069987 via CL 8069988 via CL 8069989 via CL 8095348 via CL 8095462
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8143009 by bob tellez in Dev-Build branch]
2019-08-20 22:49:56 -04:00
ben woodhouse
57d90dfdbf CsvCollate 1.25
Averaging no longers shortens the output CSV to the minimum CSV length. Instead, stat frame values are averaged across the CSVs we have frames for. This allows for meaningful comparisons of large sets of CSVs
TODO: process the CSVs one at a time to reduce peak memory use

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 8069626 via CL 8095248 via CL 8095363
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8142385 by ben woodhouse in Dev-Build branch]
2019-08-20 22:47:58 -04:00
josh engebretson
3a0083e5bd Gauntlet: Fixing issue with server/beacon offset
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 8061173 via CL 8061175 via CL 8061244 via CL 8092264 via CL 8092322
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8134269 by josh engebretson in Dev-Build branch]
2019-08-20 22:19:56 -04:00
chris babcock
12973b3c4b Add store version as a comment to main and patch OBB files so they are unique for uploading to Play Store
#jira UE-79037
#ue4
#android
[FYI] Jack.Porter,Allan.Bentham
#rb Jack.Porter

#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 8092125 in //UE4/Release-4.23/... via CL 8092159
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8134261 by chris babcock in Dev-Build branch]
2019-08-20 22:19:54 -04:00
jeff newquist
10e1c55cc4 Add subclass ModuleRules file references to ExternalDependencies to properly generate new makefiles when they are changed.
#rb ben.marsh

[CL 8127110 by jeff newquist in Dev-Build branch]
2019-08-20 13:10:19 -04:00
Ben Marsh
81d4acb07f Fix Clang executable path, missing source file in output compile_commands.json.
#rb none
#rnx

[CL 8126541 by Ben Marsh in Dev-Build branch]
2019-08-20 11:46:20 -04:00
Ben Marsh
7df7a82fd2 UBT: Add an error when trying to build the editor in an unsupported configuration.
#rb none

[CL 8126478 by Ben Marsh in Dev-Build branch]
2019-08-20 11:35:51 -04:00
josh engebretson
c3c7ad017d Gauntlet: Fix issue with Android saved path (verified adb version unrelated)
#rnx
[FYI] justin.marcus, clayton.langford


#ROBOMERGE-SOURCE: CL 8119240 via CL 8119242 via CL 8123045
#ROBOMERGE-BOT: (v401-8057353)

[CL 8124771 by josh engebretson in Main branch]
2019-08-20 09:59:47 -04:00
Ben Marsh
b84e7e5757 Missing copyright notices.
#rb none
#rnx

[CL 8124531 by Ben Marsh in Dev-Build branch]
2019-08-20 09:26:18 -04:00
Ben Marsh
d72aa608d4 Fix missing copyright notices.
#rb none
#fyi Ryan.Durand
#rnx

[CL 8124512 by Ben Marsh in Dev-Build branch]
2019-08-20 09:24:05 -04:00
Ben Marsh
f7f2eee7db Missing file.
#rb none
#rnx

[CL 8121650 by Ben Marsh in Dev-Build branch]
2019-08-19 21:10:34 -04:00
Ben Marsh
f0b21050a3 Add a "GenerateClangDatabase" mode to UBT, which will generate a compile_commands.json file in the workspace root directory for Clang tooling. Filter which files to include using the -Filter=... argument (eg. -Filter=QAGame/Source/...).
Example usage:

UnrealBuildTool.exe UnrealPak Win64 Development -Mode=GenerateClangDatabase -Filter=Engine/Source/Programs/...

#rb none

[CL 8121646 by Ben Marsh in Dev-Build branch]
2019-08-19 21:09:01 -04:00