Commit Graph

294 Commits

Author SHA1 Message Date
aaron mcleran
c853793da9 Fixing tooltips in platform settings
#jira UE-123772
#rb trivial

#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 18427039 in //UE5/Release-5.0/... via CL 18427112
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18427141 by aaron mcleran in ue5-release-engine-test branch]
2021-12-09 18:59:43 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
florin pascu
884093db5c Fix IOSAudioBuffer.cpp compile error
#jira UE-134145
#rb none
[FYI] Jack.Porter

#ushell-cherrypick of 18081785 by Jack.Porter

#ROBOMERGE-AUTHOR: florin.pascu
#ROBOMERGE-SOURCE: CL 18150859 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)

[CL 18150874 by florin pascu in ue5-release-engine-test branch]
2021-11-11 10:12:09 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
marc audy
616de191ce Fix uninitialized variable warning
[CODEREVIEW] axel.riffard, jack.porter

#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 17613190 in //UE5/Release-5.0/... via CL 17613201
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v871-17566257)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17613213 by marc audy in ue5-release-engine-test branch]
2021-09-23 16:04:23 -04:00
axel riffard
94da811286 Display the trust popup on iOS and tvOS when using an untrusted device
#jira UE-114776
#rb jack.porter
#preflight 61444c5f4778fa00018cccb7

#ROBOMERGE-AUTHOR: axel.riffard
#ROBOMERGE-SOURCE: CL 17549185 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17549218 by axel riffard in ue5-release-engine-test branch]
2021-09-17 05:01:42 -04:00
hxhb
9cad070bd2 PR #7737: Fix SSHKey lookup issues of RemoteAddr:Port (Contributed by hxhb)
#jira UE-107688
#rb Jack.Porter
#preflight 60b88858a7a9370001c31394

[CL 16544919 by hxhb in ue5-main branch]
2021-06-03 06:02:54 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
jack porter
6d30d842dd Fix UE4 reference
#rb trivial
#jira UE-111767

#ROBOMERGE-SOURCE: CL 15888140 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15890066 by jack porter in ue5-main branch]
2021-04-01 11:40:08 -04:00
axel riffard
700293af06 Unshelved from pending changelist '15636883':
Remove iOS 12 and set Metal shading default to 2.2 #jira UE-106400 #rb jack.porter #review-15719081 jack.porter
#preflight 6051f3c280c0a500017227a2

#ROBOMERGE-OWNER: axel.riffard
#ROBOMERGE-AUTHOR: axel.riffard
#ROBOMERGE-SOURCE: CL 15719621 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15723503 by axel riffard in ue5-main branch]
2021-03-17 10:40:58 -04:00
will damon
4d9be3b3ee Update min macOS version to 10.15 and roll default MSL to v2.2.
[REVIEW] [at]richard.wallis [at]axel.riffard [at]jack.porter [at]dave.hunter
#jira UE-109999
#rnx

#ROBOMERGE-SOURCE: CL 15681710 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15684125 by will damon in ue5-main branch]
2021-03-11 21:32:06 -04:00
maxwell hayes
a781a97922 Improvements to Metasound Wave decoding
#jira UE-108501, UE-107548, UEAU-693
#rb Phil.Popp

#ROBOMERGE-SOURCE: CL 15564761 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15564769 by maxwell hayes in ue5-main branch]
2021-03-01 20:25:28 -04:00
aaron cox
81656650be Add option to override the path on the remote build Mac where iOS builds are performed.
#rb Axel.Riffard
#p4v-cherrypick 15375484

#ROBOMERGE-SOURCE: CL 15378087 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15378796 by aaron cox in ue5-main branch]
2021-02-10 15:21:03 -04:00
dmitriy dyomin
63f764f157 Removed PVRTC support, iOS apps will be packaged using ASTC compression (requires A8, iPhone6)
#rb jack.porter

#ROBOMERGE-SOURCE: CL 15374851 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15374853 by dmitriy dyomin in ue5-main branch]
2021-02-10 04:07:30 -04:00
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
Josh Adams
1439675a3e - Added tagged retrieval to work with regex'd tags
- Added some Turnkey settings to IOSRuntimeSettings
- Added some of the IOSRuntimeSettings to be stripped out in the IniKeyBlacklist so that passwords aren't shipped
- Fixed smb: volume mounting in Turnkey
- Changed IOS prereq validation to be driven more by the bundleid, and then will hunt down a cert that matches the "best" provision that matches the bundleid. Then, uses the bundleid (with regex) to find a cert to install via Turnkey. Full wildcards can break it, so TeamID can be used to narrow down valid provisions

[CL 13886561 by Josh Adams in ue5-main branch]
2020-07-17 16:07:26 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
jack porter
e733768270 Marked Custom Launchscreen Storyboards experiemental in IOS Project Settings for 4.25.0
#jira UE-92556
#rb Trivial
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 13055077 in //UE4/Release-4.25/... via CL 13055079 via CL 13055098
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13055101 by jack porter in Main branch]
2020-04-28 10:53:12 -04:00
josh adams
13bc36c98d Moving Binaries and Build NotForLicensees files around
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12740027 via CL 12740029 via CL 12740030
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12740031 by josh adams in Main branch]
2020-04-11 08:47:06 -04:00
jack porter
4244da33f5 Minor fixes to launch screen storyboard editor UI
#rb Allan Bentham
[FYI] Axel.Riffard
#jira UE-85720
#lockdown cristina.riveron

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 12559112 in //UE4/Release-4.25/... via CL 12559114 via CL 12559129
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12559130 by jack porter in Main branch]
2020-04-02 13:40:29 -04:00
jack porter
d318d6e55c Full Storyboard support for iOS
Removal of old Static Launch Screen Logic

#rb jack.porter
#jira UE-85720
#lockdown christina.riveron

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: axel.riffard
#ROBOMERGE-SOURCE: CL 12516944 in //UE4/Release-4.25/... via CL 12517030 via CL 12519927
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12520012 by jack porter in Main branch]
2020-04-02 08:34:15 -04:00
Jack Porter
7f23ea4b6f Fix RoboMerge duplicated code causing CIS issue
#rb None
#jira UE-91033

[CL 12368902 by Jack Porter in Main branch]
2020-03-23 09:41:08 -04:00