Commit Graph

103 Commits

Author SHA1 Message Date
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
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
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
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
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
jack porter
ab6f4957af Storyboard Full Support (Including compilation and Editor Support)
#rb Jack.Porter
#jira UE-85720
#lockdown cristina.riveron

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: axel.riffard
#ROBOMERGE-SOURCE: CL 12367968 in //UE4/Release-4.25/... via CL 12367969
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12367997 by jack porter in Main branch]
2020-03-23 01:39:23 -04:00
jian ru
b8138c41bd Landscape visual mesh LOD streaming (mobile only)
[FYI] Peter.Sauerbrei,Chris.Bunner


#ROBOMERGE-OWNER: jian.ru
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 12126084 via CL 12126339 via CL 12132576
#ROBOMERGE-BOT: (v659-12123632)

[CL 12132633 by jian ru in Main branch]
2020-03-11 12:57:20 -04:00
brian zaugg
166baf35e9 On iOS builds, copy LaunchScreen.storyboardc into the app bundle if the project setting is enabled.
#rb Axel.Riffard


#ROBOMERGE-OWNER: brian.zaugg
#ROBOMERGE-AUTHOR: brian.zaugg
#ROBOMERGE-SOURCE: CL 11928501 via CL 11928504 via CL 11928509 via CL 11930338
#ROBOMERGE-BOT: (v656-11643781)

[CL 11949847 by brian zaugg in Main branch]
2020-03-05 14:12:08 -05:00
jack porter
5d9a81b1f5 Added a project setting to enable files created by UE4 to appear in the iOS on-device Files App (disabled by default)
[FYI] Thomas.Ross
#rb Dmitriy.Dyomin


#ROBOMERGE-SOURCE: CL 11153138 via CL 11153139
#ROBOMERGE-BOT: (v640-11091645)

[CL 11153140 by jack porter in Main branch]
2020-01-29 04:22:38 -05:00
mic rooney
f60752071d Adding option to disable phone vibration when controllers are attached to mobile devices
#ROBOMERGE-SOURCE: CL 10989056 via CL 10989708 via CL 10989725
#ROBOMERGE-BOT: (v633-10983880)

[CL 10989744 by mic rooney in Main branch]
2020-01-14 19:39:25 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Andre Marier
fe62eba6b9 - added a 120fps option for ios
- added bEnableDynamicMaxFPS option

[at]Pete.Sauerbrei
#rb Francois.Guimond
#rnx


#ROBOMERGE-OWNER: Andre.Marier
#ROBOMERGE-AUTHOR: andre.marier
#ROBOMERGE-SOURCE: CL 10379271 via CL 10380105 via CL 10380108
#ROBOMERGE-BOT: (v594-10333955)

[CL 10380655 by Andre Marier in Main branch]
2019-11-22 16:52:12 -05:00
ethan geller
13bb99e32a Back out changelist 9826412 to fix patch diff in cook.
#ROBOMERGE-SOURCE: CL 10221882 via CL 10222025 via CL 10222065 via CL 10222106
#ROBOMERGE-BOT: (v590-10202696)

[CL 10222163 by ethan geller in Main branch]
2019-11-14 15:27:56 -05:00
jack porter
776b7b9fca Set Max Metal Target Version default to 2.0
Marked iOS Project as a Framework as experimental
#jira UE-78655
#jira UE-81844
#rb None
#lockdown Cristina.Riveron
[FYI] Peter.Sauerbrei

#ROBOMERGE-SOURCE: CL 9847145 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v548-9842178)

[CL 9847147 by jack porter in Main branch]
2019-10-27 22:48:53 -04:00
ethan geller
c61fe9ef76 Add stream chunk override in per platform cook overrides.
#rb maxwell.hayes


#ROBOMERGE-SOURCE: CL 9826412 via CL 9826418 via CL 9826421
#ROBOMERGE-BOT: (v546-9757112)

[CL 9826427 by ethan geller in Main branch]
2019-10-24 19:53:53 -04:00