Commit Graph

176 Commits

Author SHA1 Message Date
Chris Gagnon
d7d4ee7b38 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
#rb none
#fyi Max.Chen, Tim.Gautier

[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
Chris Gagnon
0a9f86357f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -04:00
Matt Kuhlenschmidt
fddbe0a896 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -04:00
Chris Gagnon
56e73ed431 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -04:00
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
Chris Gagnon
42c199aeb6 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5225772 by Chris Gagnon in Dev-Editor branch]
2019-02-27 11:02:17 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Matt Kuhlenschmidt
46e3285149 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4543237 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-06 10:00:36 -05:00
jack porter
83759d9ce3 Fix case issue one iPhone X splash screens and renamed file to solve P4 issues, added Project Settings UI for iPhone XSMax/XR screenshots and replaced them with the updated version
#jira UE-65417
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 4514553 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4514554 by jack porter in Staging-4.21 branch]
2018-10-26 22:20:14 -04:00
brian zaugg
2ec4dbc85a Support for iOS Client builds.
#rb Jack.Porter
#jira UE-64536

#ROBOMERGE-SOURCE: CL 4493237 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4493238 by brian zaugg in Staging-4.21 branch]
2018-10-19 20:22:05 -04:00
brian zaugg
186d340474 Support for Windows Store version of iTunes.
#rb Peter.Sauerbrei
#jira UE-60733

#ROBOMERGE-SOURCE: CL 4453883 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4453887 by brian zaugg in Staging-4.21 branch]
2018-10-11 14:44:48 -04:00
cosmin sulea
a593f62458 UE-64937 - IphonePackager cannot verify UDID on new devices (XS or newer)
#jira UE-64937
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 4439715 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4439718 by cosmin sulea in Staging-4.21 branch]
2018-10-09 10:58:55 -04:00
ben marsh
da6c7d82b4 UBT: Avoid trying to figure out which mobile provision to use for a project when we already know the path to the provision we want. Also fix certificate not being updated if mobile provision changes.
#rb none
[FYI] Peter.Sauerbrei
#jira

#ROBOMERGE-SOURCE: CL 4407741 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4407744 by ben marsh in Staging-4.21 branch]
2018-09-28 16:50:29 -04:00
Ben Marsh
af87bb037a Attempted fix for incorrect certificate errors when compiling remotely.
* Overloaded meaning of the -Certificate argument (ie. as the output path rather than as the desired certificate when selecting a provision) was causing certificate name check to fail. Now uses a different parameter to specify the output path.
* TVOS argument was not being passed when exporting the certificate, also causing the wrong provision/certificate pair to be selected.
* Add support for the -bundlename argument, though it shouldn't be necessary when invoked from UBT since the UUID discovered in a previous invocation of IPP is explicitly specified.

Since the provision UUID is already being specified to IPP, it should be able to identify the correct provision on phase -1 using this info.

#rb none
#jira UE-63859
#codereview Peter.Sauerbrei
#lockdown Jack.Porter

[CL 4354338 by Ben Marsh in Dev-Mobile branch]
2018-09-10 09:49:20 -04:00
Jack Porter
6298dbf1ff Back out deployment server changes (CL 4343860)
#jira UE-63826
#rb None

[CL 4354028 by Jack Porter in Dev-Mobile branch]
2018-09-10 03:28:54 -04:00
Jack Porter
61224ef100 Fix null pointer exception in iPhonePackager when a matching certificate cannot be found
#rb None
#jira UE-63821

[CL 4350092 by Jack Porter in Dev-Mobile branch]
2018-09-07 04:49:16 -04:00
Jack Porter
de14f5eda1 Fix UAT compile on Mac and Linux by making prebuild step only run on Windows
#jira UE-63815
#jira UE-63761
#rb None

[CL 4349733 by Jack Porter in Dev-Mobile branch]
2018-09-06 20:04:30 -04:00
Cosmin Sulea
ff7badc553 UEMOB-332 - Make the Deployment Server an actual server
#jira UEMOB-332
#rb Jack.Porter

[CL 4343860 by Cosmin Sulea in Dev-Mobile branch]
2018-09-05 05:50:33 -04:00
Cosmin Sulea
ba25b0cf6b iOS - iPhonePackager ExportCertificate command failing 100%
#rb Jack.Porter
#fyi Peter.Sauerbrei

[CL 4343797 by Cosmin Sulea in Dev-Mobile branch]
2018-09-05 04:09:52 -04:00