Commit Graph

107 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
Yuriy ODonnell
cd3a7c2c77 Fix for copying Vulkan validation layers
#jira UE-110904
#ue4
#android
[at]Jack.Porter
#rb Jack.Porter

#lockdown Jack.Porter

#ROBOMERGE-SOURCE: CL 15724017 in //UE4/Release-4.26/... via CL 15724170 via CL 15724194 via CL 15724212
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v781-15675533)

#ushell-cherrypick of 15744261 by chris.babcock

[CL 15746401 by Yuriy ODonnell in ue5-main branch]
2021-03-19 08:12:49 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
will damon
14ba1cc2df Fix build.
#rb trivial
[FYI] chris.babcock
#jira none
#rnx

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

[CL 15700536 by will damon in ue5-main branch]
2021-03-15 17:07:30 -04:00
chris babcock
30e37609c3 Remove unnecessary Gradle steps if some files did not change
#jira UE-110644
#ue5
#android
#rb Jack.Porter

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

[CL 15699798 by chris babcock in ue5-main branch]
2021-03-15 15:53:45 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
chris babcock
25af919229 Add additional conditions for invalidating previous APK
#jira UE-109394
#ue5
#android
Brandon.Schaefer
#rb Brandon.Schaefer

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

[CL 15536170 by chris babcock in ue5-main branch]
2021-02-25 19:34:21 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
chris babcock
cace952af7 Add cleanup for old UE4 artifacts when packaging for Android
#jira UE-107781
#ue5
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

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

[CL 15307656 by chris babcock in ue5-main branch]
2021-02-03 20:49:27 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Chris Babcock
a2d9bd542e Change Android class names from ue4 to unreal
#jira UE-104943
#ue5
#android
#review @Jack.Porter
#rb Jack.Porter

[CL 15284943 by Chris Babcock in ue5-main branch]
2021-02-02 17:21:35 -04:00
carl lloyd
129448538d Added support for custom Android Vulkan layers
#rb Jack.Porter

[CL 15272040 by carl lloyd in ue5-main branch]
2021-02-01 13:13:05 -04:00
Chris Babcock
594eef5b40 Change single quotes to double quotes for .NET Core on Mac/Linux Gradle calls
#jira UE-104927
#ue5
#android
#fyi Jack.Porter
#rb Andrei.Kasianov

[CL 15207721 by Chris Babcock in ue5-main branch]
2021-01-26 10:57:12 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Josh Adams
b84453bc37 - Remove support for 32-bit Android, still have support for Arm64 and X64. Next checkin will delete the libs
#rb chris.babcock,jack.porter
#fyi chris.babcock,jack.porter

[CL 15056295 by Josh Adams in ue5-main branch]
2021-01-12 16:59:21 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware.
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
2020-12-20 17:32:59 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
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
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
chris babcock
826d93d62e Check for change in active plugins on Android and clean Intermediate/Android if necessary to prevent packaging failures
#jira UE-92126
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12873795 in //UE4/Release-4.25/... via CL 12873798 via CL 12873801
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12873807 by chris babcock in Main branch]
2020-04-16 17:27:12 -04:00
chris babcock
55b8d1e0fc Set a new minimum SDK level for Android using Gradle
#jira UE-92113
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 12871574 in //UE4/Release-4.25/... via CL 12871581 via CL 12871589
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12871595 by chris babcock in Main branch]
2020-04-16 15:48:20 -04:00