Commit Graph

1054 Commits

Author SHA1 Message Date
graeme thornton
243564979c Refactored ini key stripping in UAT to be driven by config settings, exposed in the project packaging settings
Added the ability to set a list of config sections to strip while staging

#rb daniel.lamb


#ROBOMERGE-SOURCE: CL 9485548 via CL 9485550 via CL 9485552
#ROBOMERGE-BOT: (v508-9471939)

[CL 9485554 by graeme thornton in Main branch]
2019-10-09 04:54:01 -04:00
bob tellez
97fd62c7a6 #UE4 Staging fix (build health)
#ROBOMERGE-SOURCE: CL 9474601 via CL 9474614 via CL 9474619 via CL 9474621 via CL 9474628
#ROBOMERGE-BOT: (v508-9471939)

[CL 9474645 by bob tellez in Main branch]
2019-10-08 11:45:20 -04:00
justin marcus
035e3d23bc Resurrect [at]Ben.Marsh's CopyBuildToStaging() optimizations.
Re-submit my change to fix pakchunk1 missing on mobile.
[REVIEW] [at]Daniel.Lamb [at]Ben.Marsh


#ROBOMERGE-SOURCE: CL 9456515 via CL 9456525 via CL 9456528 via CL 9456530 via CL 9456547
#ROBOMERGE-BOT: (v495-9448618)

[CL 9456578 by justin marcus in Main branch]
2019-10-07 15:03:45 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Ben Marsh
b6039a9873 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419420 by Ben Marsh in Dev-Build branch]
2019-10-04 11:20:44 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
brandon schaefer
7d445c1103 Fix incorrect merge (Thanks dyanikoglu! PR #6256)
#jira UE-81260
#rb none
[FYI] Ben.Marsh
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9390019 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9390020 by brandon schaefer in Main branch]
2019-10-03 09:56:14 -04:00
hongyi yu
97765104d4 Patch pak file won't be generated for EarlyStartup pak files
#rb Justin.Marcus

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 9230838 via CL 9230917 via CL 9230954
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v455-9298202)

[CL 9334260 by hongyi yu in Dev-Build branch]
2019-10-02 01:05:59 -04:00
Nick Shin
3526d16d5e merge/copyup to parent stream - HTML5 platform extension
#jira UEMOB-482  HTML5 platform as a plug in
#rb josh.adams
#rn

[CL 9306021 by Nick Shin in Dev-Build branch]
2019-09-30 15:13:56 -04:00
hongyi yu
7dd448e9cf Patch pak file won't be generated for EarlyStartup pak files
#rb Justin.Marcus


#ROBOMERGE-SOURCE: CL 9230838 via CL 9230917
#ROBOMERGE-BOT: (v443-9013191)

[CL 9230954 by hongyi yu in Main branch]
2019-09-27 15:57:08 -04:00
treilhes
1acb4370a9 PR #6235: Installed build was missing Client/Server Target type in BaseEngine.ini InstalledPlatforms (Contributed by treilhes)
#rb none
#rnx

[CL 9116973 by Ben Marsh in Main branch]
2019-09-25 20:17:41 -04:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
2019-09-24 16:13:51 -04:00
jamie dale
3f63ac3abf Switch to new version of FreeType, HarfBuzz, and ICU
Note: This change supersedes CL# 8673172

#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 8677075 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8752173 by jamie dale in Dev-Build branch]
2019-09-17 11:34:29 -04:00
Ben Marsh
53e2288d77 Build armv7 and arm64 architectures when packaging Android plugins.
#rb none

[CL 8741522 by Ben Marsh in Dev-Build branch]
2019-09-17 08:06:34 -04:00
jamie dale
c5dc752330 Only stage a single version of the ICU data
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 8616074 via CL 8629476 via CL 8631403
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8728579 by jamie dale in Dev-Build branch]
2019-09-17 02:09:13 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Jamie Dale
240cbfb627 Switch to new version of FreeType, HarfBuzz, and ICU
Note: This change supersedes CL# 8673172

#rb none
#rnx

[CL 8677075 by Jamie Dale in Main branch]
2019-09-13 14:55:42 -04:00
Ben Marsh
3cf7fb39fc Remove #region blocks.
#rb none
#rnx

[CL 8676383 by Ben Marsh in Dev-Build branch]
2019-09-13 14:02:02 -04:00
chris gagnon
ce3f2560b0 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 8614014 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v409-8614070)

[CL 8634529 by chris gagnon in Dev-Build branch]
2019-09-11 08:23:41 -04:00
jamie dale
00628eddd1 Only stage a single version of the ICU data
#jira


#ROBOMERGE-SOURCE: CL 8616074 via CL 8629476
#ROBOMERGE-BOT: (v409-8614070)

[CL 8631403 by jamie dale in Main branch]
2019-09-10 21:03:49 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
daniel lamb
b5d35a47c5 Remove development asset registry from regioncn plugin builds.
[REVIEW] Peter.Sauerbrei

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 8506819 via CL 8506820 via CL 8506825 via CL 8508398 via CL 8512214 via CL 8512308
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v408-8574093)

[CL 8584032 by daniel lamb in Dev-Build branch]
2019-09-10 03:17:34 -04:00
Ben Marsh
324e2e6c5b Remove the bBuildEditor flag passed to ModuleDescriptor.IsCompiledInConfiguration(). This is always determined from the target type now.
#rb none
#rnx

[CL 8576545 by Ben Marsh in Dev-Build branch]
2019-09-09 16:33:08 -04:00
daniel lamb
bb8ef5ea6f Remove development asset registry from regioncn plugin builds.
[REVIEW] Peter.Sauerbrei


#ROBOMERGE-SOURCE: CL 8506819 via CL 8506820 via CL 8506825 via CL 8508398 via CL 8512214
#ROBOMERGE-BOT: (v406-8472469)

[CL 8512308 by daniel lamb in Main branch]
2019-09-05 18:23:13 -04:00
Ben Marsh
9da9103e2e UAT: Build both flavors of UHT (with project and without) when packaging, since we don't know whether any UHT plugins are enabled in the project.
#rb none
#rnx

[CL 8384249 by Ben Marsh in Main branch]
2019-08-30 11:52:04 -04:00