Commit Graph

47 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
yoan stamant
a656c465ce misc non-unity compilation fixes
#ROBOMERGE-AUTHOR: yoan.stamant
#ROBOMERGE-SOURCE: CL 17679436 in //UE5/Release-5.0/... via CL 17685191
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v875-17642767)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17685208 by yoan stamant in ue5-release-engine-test branch]
2021-09-30 19:41:43 -04:00
axel riffard
d1c74ebf35 iOS Icon Refactor step 3 : auto generate iOS icons from Marketing Icon
#jira UE-72584
#rb jack.porter

#ROBOMERGE-SOURCE: CL 17243716 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17243725 by axel riffard in ue5-release-engine-test branch]
2021-08-20 00:14:21 -04:00
axel riffard
6c49fc2f88 tvOS asset catalogue support in editor
#jira UE-121243
#rb jack.porter
#preflight 611e1073008be90001d5cc9d

#ROBOMERGE-SOURCE: CL 17230135 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17230144 by axel riffard in ue5-release-engine-test branch]
2021-08-19 06:09:21 -04:00
andriy tylychko
6bf3101dcd deprecated FTicker and family and replaced by thread-safe FTSTicker
#jira UE-120090
#rb francis.hurteau


#ROBOMERGE-SOURCE: CL 17176325 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17176374 by andriy tylychko in ue5-release-engine-test branch]
2021-08-16 11:09:22 -04:00
axel riffard
43f1f454ef Refactor iOS Icons : create asset catalog according to present file
#jira UE-72584
#rb jack.porter
#preflight 60d4858157b3020001153d0c

#ROBOMERGE-SOURCE: CL 16773695 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16773701 by axel riffard in ue5-release-engine-test branch]
2021-06-24 10:59:52 -04:00
axel riffard
e27b75347a Fix Min and Max Shaders version for iOS
#rb jack.porter
#lockdown jack.porter
#jira UE-106400
#preflight 60b867ff30b99500019edc3b

[CL 16544393 by axel riffard in ue5-main branch]
2021-06-03 03:02:52 -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
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
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
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
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
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
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -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
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
jack porter
79aa064b79 Set minimum iOS version to 11
#jira UE-78649
#rb Dmitriy.Dyomin
[FYI] Peter.Sauerbrei

#ROBOMERGE-SOURCE: CL 8019256 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 8019260 by jack porter in Main branch]
2019-08-13 23:43:41 -04:00
mark satterthwaite
07f1594ba5 In order to keep up with the HLR the desktop renderers now require Metal 2.0 or later on Apple's platforms - Metal 1.2 just isn't sufficient.
#rb none
#jira UE-71589

#ROBOMERGE-SOURCE: CL 5415631 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5415651 by mark satterthwaite in Main branch]
2019-03-15 12:04:52 -04:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Mark Satterthwaite
ae9401146d Remove all support for Metal prior to Metal 1.2 on iOS/tvOS and Metal 2.0 on macOS. This permits some fairly radical simplifications and removal of a number of workarounds.
- All Buffer<>/RWBuffer<> objects are now bound as texture2d or texture_buffer, unless they are 3-component, in which case they are bound as raw T* buffer pointers.
- 3-component Buffer/RWBuffer objects should now work - Metal needed to use packed_* types internally as normal 3-component types in Metal are the same size as 4-component types which is different to HLSL. This is untested as we have no such example.
- Texture Gather/GatherCompare operations have been fixed and should now work.
- Remove all the TypedBufferFormat function-constant specialisation infrastructure and metadata as it is no longer necessary.
- Remove all the raw-conversion for 1, 2 and 4 component vector types as it is no longer required.
- Fixed input qualifiers (centroid, linear, etc.) for Fragment shader inputs - they should now work.
- Remove a bunch of Metal specific shader changes due to buffer type casting and swizzling that will now just work.
- Use the BGRA vertex format for FColor on Metal when available (everywhere but iOS/tvOS 10 using Metal 1.2).
- Simplify ShouldCompilePermutation & similar functions now that we have fewer versions to support.

#rb none
#jira N/A

[CL 4729845 by Mark Satterthwaite in Dev-Rendering branch]
2019-01-15 18:01:31 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00