Commit Graph

90 Commits

Author SHA1 Message Date
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
ben marsh
af150afdbe Fix path to Android keystore causing build failures.
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 12766499 via CL 12766503 via CL 12766504
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12766506 by ben marsh in Main branch]
2020-04-13 17:31:02 -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
florin pascu
3f209910fb Fix for universal apk appbundle crashing in WriteAllLines because file is in use
#jira UE-91779
#rb  Chris.Babcock
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12690557 in //UE4/Release-4.25/... via CL 12690559 via CL 12690568
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12690583 by florin pascu in Main branch]
2020-04-09 11:50:37 -04:00
chris babcock
4163e49f74 Fix broken changelist as version
#jira none
#ue4
#android
[FYI] Michael.Sartain
#rb trivial

#ROBOMERGE-SOURCE: CL 12237191 in //UE4/Release-4.25/... via CL 12237196
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12239493 by chris babcock in Main branch]
2020-03-17 23:19:34 -04:00
michael sartain
43ef13a97b Fix UnrealBuildTool unused variable warnings
#jira none
#rb Ben.Marsh
[FYI] Andrew.Grant, Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12224860 in //UE4/Release-4.25/... via CL 12224862
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224868 by michael sartain in Main branch]
2020-03-16 19:04:42 -04:00
chris babcock
b30c97e125 Added more control over Gradle project
- ANDROID_TOOLS_BUILD_GRADLE_VERSION may be set in gradle.properties by <gradleProperties> in UPL
- settings.gradle may be added to with <settingsGradleAdditions> in UPL

#jira UE-90616
#ue4
#android
[FYI] Jack.Porter
#rb trivial

#ROBOMERGE-SOURCE: CL 12161607 in //UE4/Release-4.25/... via CL 12161609
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12161611 by chris babcock in Main branch]
2020-03-13 06:48:04 -04:00
jack porter
9a7c32c36b Unblocking Robomerge for "Add gameActivityForceQuitAdditions to allow android plugins to be notified when an application requests to quit."
#rb chris.babcock
#rnx
#fyi Allan.Bentham

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 12000213 via CL 12000756 via CL 12002284 via CL 12005787
#ROBOMERGE-BOT: (v656-11643781)

[CL 12048213 by jack porter in Main branch]
2020-03-07 05:52:12 -05:00
allan bentham
b457410244 Add option for android crash context to not write log when storing crashinfo.
Add gameActivityOnRestartApplicationAdditions to allow plugins to get notice of app restart requests.
#rb chris.babcock
#rnx


#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 11894983 via CL 11894984 via CL 11894986
#ROBOMERGE-BOT: (v656-11643781)

[CL 11895006 by allan bentham in Main branch]
2020-03-04 06:55:54 -05:00
carl lloyd
a745d7eb86 Removed ATC/ETC1 and Android PVR texture formats
[at]Chris.babcock [at]Jack.porter
[FYI] [at]Rolando.Caloca [at]Luke.Thatcher
#rb Chris.babcock, Jack.porter, Rolando Caloca
#jira none

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

[CL 11825801 by carl lloyd in Main branch]
2020-03-02 11:26:01 -05:00
chris babcock
6df461dc0d Provide more control over OBB selection
#jira UE-89810
#ue4
#android
#rb Brandon.Schaefer

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

[CL 11792949 by chris babcock in Main branch]
2020-02-28 20:20:36 -05:00
chris babcock
89806504ee Update Android toolchain to NDK 21 (20 also supported for x86_64) additional files
#jira UE-80046
#ue4
#android
#rb Bradon.Schaefer


#ROBOMERGE-SOURCE: CL 11555526 in //UE4/Release-4.25/... via CL 11555547
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11578380 by chris babcock in Main branch]
2020-02-21 15:19:40 -05:00
andrew grant
fe6bf6d6a0 Make sure libgnustl_shared is writable in intermediates folder.
#tests Android builds from AutoSDK can now be cleaned.

[FYI] chris.babcock


#ROBOMERGE-SOURCE: CL 11507176 via CL 11507199 via CL 11507207
#ROBOMERGE-BOT: (v654-11333218)

[CL 11507215 by andrew grant in Main branch]
2020-02-18 13:27:37 -05:00
chris babcock
2753dde55a Update BundleTool to 0.13.0
#jira UE-88929
#ue4
#android
#rb Tyler.Quinn

#ROBOMERGE-SOURCE: CL 11467813 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11467815 by chris babcock in 4.25-Plus branch]
2020-02-17 17:23:22 -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
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Chris Babcock
79be6da4c5 IsAllowedRemoteNotifications returns false if GCM or Firebase plugin not included for Android
#jira UE-86027
#ue4
#android
#rb Ben.Temple

[CL 10995420 by Chris Babcock in Dev-RenderPlat-Staging branch]
2020-01-15 13:53:46 -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