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
anthony bills
b1c397505b
[IOS] Check if the bundle exists before trying to copy manifests.
...
- This prevents an error being displayed in the log before staging.
[at]jack.porter
#jira UE-86335
#rb jack.porter
#ROBOMERGE-SOURCE: CL 11458335 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11458336 by anthony bills in 4.25-Plus branch]
2020-02-16 21:46:19 -05:00
Rolando Caloca
5b82f15def
Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
...
#rb none
#rnx
[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Juan Canada
2ecf4f9708
Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
...
#rnx
#rb none
[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -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
Rolando Caloca
e72619ab3b
Merging //UE4/Main@10410794 to Dev-RenderPlat-Staging
...
#rb none
#rnx
[CL 10419692 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-11-25 12:35:20 -05:00
jack porter
88ddfd4c76
Fixed Device Output Log not working for iOS devices from Windows
...
Fixed a number of issues with Deployment Server
#rb Dmitriy.Dyomin
#jira UE-79627
#jira UE-69887
#jra UE-69811
#lockdown: Cristina.Riveron
#ROBOMERGE-SOURCE: CL 10406620 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)
[CL 10406621 by jack porter in Main branch]
2019-11-25 02:09:44 -05:00
cosmin sulea
e93ee311ba
UE-75605 Unreal Deployment Server Launch crashing randomly with the editor open
...
#jira UE-75605
#rb Jack.Porter
#ROBOMERGE-SOURCE: CL 7288428 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)
[CL 7288429 by cosmin sulea in Main branch]
2019-07-12 04:43:27 -04:00
chris stephenson
6a5cd5a152
#fortnite Update to DeploymentServer.exe for IPhonePackager to fix dependency breakage.
...
Bumped DeploymentServer to Net 4.6.2
#ROBOMERGE-SOURCE: CL 6677976 via CL 6681228
#ROBOMERGE-BOT: (v363-6677109)
[CL 6681434 by chris stephenson in Main branch]
2019-05-30 20:33:59 -04:00
chris stephenson
e87fcef0c4
#IPhonePackager
...
Add copyfileout command parameter to DeploymentServer project. This is done to provide a method of retrieving a single specific file from an iOS device (log file, for example) without requiring a full backup of the bundle provided
#rb Pete Sauerbrei, Josh Adams, Jack Porter, Ben Salem
#ROBOMERGE-OWNER: chris.stephenson
#ROBOMERGE-AUTHOR: chris.stephenson
#ROBOMERGE-SOURCE: CL 6653018 via CL 6653518
#ROBOMERGE-BOT: (vundefined-6620334)
[CL 6654554 by chris stephenson in Main branch]
2019-05-28 13:40:35 -04:00
Jeff Williams
9d2656a485
Bumped DeploymentServer to Net 4.6.2 for compatibility with MDI
...
#rb andrew.grant
[CL 6599617 by Jeff Williams in Main branch]
2019-05-21 16:26:00 -04:00
cosmin sulea
1ee8e05524
UE-69887 - DeploymentServerLauncher.exe does not always quit
...
#jira UE-69887
#rb Jack.Porter
#lockdown Cristina.Riveron
#ROBOMERGE-VERSION: 348-6547088
#ROBOMERGE-SOURCE: CL 6573489 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 6573490 by cosmin sulea in Main branch]
2019-05-20 05:38:31 -04:00
cosmin sulea
8f98139561
UE-73030 - DeploymentServerLauncher crash with multiple editor sessions
...
#jira UE-73030
#rb Jack.Porter
#lockdown Cristina.Riveron
#ROBOMERGE-SOURCE: CL 6473865 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 6473926 by cosmin sulea in Main branch]
2019-05-15 08:03:57 -04:00
cosmin sulea
76f4ac2316
UE-72446 - Deployment server crashes in DeploymentServer.Program.ClientLoop
...
#jira UE-72446
#rb Jack.Porter
#lockdown Cristina.Riveron
#ROBOMERGE-SOURCE: CL 5826395 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 5826397 by cosmin sulea in Main branch]
2019-04-11 06:09:27 -04:00
Cosmin Sulea
99a8d41655
Merge conflict from Release-4.22 to UE4/main
...
#jira UE-70734
#rb Jack.Porter
#lockdown nick.penwarden
[CL 5368380 by Cosmin Sulea in Main branch]
2019-03-12 09:42:57 -04:00
cosmin sulea
40d4c4a304
UE-69280 - iOS Launch On Fails on Windows binary builds
...
UE-69887 - DeploymentServerLauncher.exe does not always quit
#jira UE-69280
#rb Jack.Porter
#ROBOMERGE-SOURCE: CL 5143595 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 5207125 by cosmin sulea in Main branch]
2019-02-26 16:33:58 -05:00
cosmin sulea
1a8c3d35f5
UE-63767 - iOS Device Output Log console does not work
...
#jira UE-63767
#rb Jack.Porter
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 5036544 by cosmin sulea in Main branch]
2019-02-18 05:54:48 -05:00
jack porter
7708296320
Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
...
Rebuild DeploymentServer
[FYI] Cosmin.Sulea
#rb None
#jira UE-69615
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4947306 by jack porter in Main branch]
2019-02-08 07:33:53 -05:00
Cosmin Sulea
d7b9559b77
UE-69055 - //UE4/Main - Build Tools CS - Processor architecture mismatch between project "MSIL" and "AMD64"
...
#jira UE-69055
#rb Jack.Porter
#lockdown: Nick.Penwarden
[CL 4822206 by Cosmin Sulea in Main branch]
2019-01-28 05:55:48 -05:00
Cosmin Sulea
5ffee026df
UE-68822 - DeploymentServer crash in IPP when DeploymentServerLauncher.exe is already running
...
#jira UE-68822
#rb Peter.Sauerbrei
[CL 4770221 by Cosmin Sulea in Dev-Mobile branch]
2019-01-22 10:41:57 -05:00
Cosmin Sulea
b0b0e2ad39
UE-68719 - iPhonePackager no longer sends output to log window
...
#jira UE-68719
#rb Jack.Porter
[CL 4760427 by Cosmin Sulea in Dev-Mobile branch]
2019-01-21 06:12:44 -05:00
Cosmin Sulea
f67fdafc46
UE-68538 - IphonePackager GUI operations are not functional
...
#jira UE-68538
#rb Jack.Porter
[CL 4749886 by Cosmin Sulea in Dev-Mobile branch]
2019-01-18 03:56:15 -05:00
Jack Porter
068ca68f0b
Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile
...
#rb None
[CL 4749281 by Jack Porter in Dev-Mobile branch]
2019-01-17 21:54:28 -05:00
Cosmin Sulea
14bd625ab2
UE-63983 - Fix and re-enable deployment server
...
#jira UE-63983
#rb Jack.Porter
[CL 4688224 by Cosmin Sulea in Dev-Mobile branch]
2019-01-08 09:35:52 -05:00
Jack Porter
0245e895e4
Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
...
#rb None
[CL 4675678 by Jack Porter in Dev-Mobile branch]
2019-01-01 23:32:24 -05:00