Commit Graph

226 Commits

Author SHA1 Message Date
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -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
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
jack porter
726be3773b Fixed iOS failure to match find profile when packaging for distribution with an ad-hoc provisioning profile
Fixed issue with fix for UE-77351 with Shipping builds
Fixed iOS automation failure enumerating folders where there user does not have permission the read the folder
#jira UE-91526
#jira UE-77351
#rb Allan.Bentham
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12917406 in //UE4/Release-4.25/... via CL 12918163 via CL 12918398
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12918444 by jack porter in Main branch]
2020-04-20 07:22:45 -04:00
jack porter
f2bbf8161a Fixed a number of cases where code was assuming Client targets are always named the same as the game target with "Client" appended.
#jira UE-77351
#rb Florin.Pascu
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12841919 in //UE4/Release-4.25/... via CL 12841963 via CL 12842002
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12842018 by jack porter in Main branch]
2020-04-16 02:01:03 -04:00
anthony bills
c365ccee71 [IOS] Add support for Apple Development and Distribution certificates.
#rb jack.porter
#jira UE-89451

#ROBOMERGE-SOURCE: CL 11851816 in //UE4/Release-4.25/... via CL 11851817
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11851820 by anthony bills in Main branch]
2020-03-03 04:40:05 -05: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
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
Jack Porter
09de789957 Pulling Dev-RPS
#rb None

[CL 11173577 by Jack Porter in Dev-Mobile branch]
2020-01-30 00:16:34 -05:00
jessicafalk
f91331404c Fix issue with iOS remote build ssh command (Contributed by jessicafalk)
#jira UE-86202
PR #6504: Fixing ssh command for remote build (Contributed by jessicafalk)
#rb Jack.Porter

[CL 11071320 by Jack Porter in Dev-Mobile branch]
2020-01-21 06:14:35 -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
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -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
Ryan Durand
c8c97107da Changes to mobile provisioning to support using a folder provided by an environment variable and to allow for the caching of mobile provisions when attempting a signing match to make sure the machine has the provisions cached locally first
#rb peter.sauerbrei
#jira none
#rnx

[CL 10803884 by Ryan Durand in Dev-Build branch]
2019-12-18 17:09:08 -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
Anthony Bills
ec42cc301a [IOS] Fix deployment of large IPA files.
- This makes sure the session and device are correctly disconnected even if the AFC comm was not opened.

#rb allan.bentham
#jira UE-81711
#fyi jack.porter, peter.sauerbrei

[CL 9549189 by Anthony Bills in Main branch]
2019-10-11 12:38:22 -04:00
jack porter
dc714eb3d8 Fix issue with Launch failing to copying contents to iOS 13 devices
#jira UE-78709
#rb Anthony.Bills
[FYI] Anthony.Bills, Peter.Sauerbrei
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 9469493 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v501-9460993)

[CL 9469496 by jack porter in Main branch]
2019-10-08 02:24:41 -04:00
jack porter
d46f62ea4a Fix issue with iPhonePackager failing on Mac with Mono 6
#rb Michael.Trepka
#jira UE-79546
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8734476 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v422-8689730)

[CL 8734480 by jack porter in Main branch]
2019-09-17 04:21:21 -04:00
Marcus Wassmer
da3a03e47c Copying //UE4/Dev-Mobile@8387500 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8387580 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-08-30 17:54:29 -04: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