Commit Graph

213 Commits

Author SHA1 Message Date
Joakim Lindqvist
bd18d9e6e8 Disabled copy local on project references for netcore projects, fixes build warnigns caused by multiple copies trying to write to the same output files.
Also reduces footprint on disk and speedsup builds slightly.

Also took a pass over all projects to fixup their output paths as there were some inconsitencies from my port to netcore.
Lastly I disabled the resource folders for everything but english to reduce some of the noise in the output folder, this just impacts which languages you get code analysis.

#jira UE-102147
#rb none

[CL 14651855 by Joakim Lindqvist in ue5-main branch]
2020-11-04 09:48:49 -04:00
Joakim Lindqvist
2750553a40 UAT Net Core - Copied project files into net core compatible format
#rb none

[CL 14572287 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:05:41 -04:00
Andrew Davidson
85e98afa93 Correct calculation of OBB per file cost
#jira FORT-321990
#ue4
#android
#rb Brandon.Schaefer

#ushell-cherrypick of 14518496 by chris.babcock

[CL 14518566 by Andrew Davidson in ue5-main branch]
2020-10-19 16:57:54 -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
chris babcock
19938ade58 Fix missing parameters
#ue4
#android
#rb none


#ROBOMERGE-SOURCE: CL 12910969 via CL 12910970 via CL 12910972
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12910973 by chris babcock in Main branch]
2020-04-19 05:18:03 -04:00
chris babcock
5901c8a0ca Add option for up to 2 overflow obb files
#ue4
#android
[CODEREVIEW] Jack.Porter
#rb none


#ROBOMERGE-SOURCE: CL 12910957 via CL 12910958 via CL 12910959
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12910960 by chris babcock in Main branch]
2020-04-19 04:56:53 -04:00
chris babcock
ea2731c75b Update small OBB limit to 1 GiB
#jira UE-90617
#ue4
#android
[FYI] Jack.Porter
#rb trivial

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

[CL 12161634 by chris babcock in Main branch]
2020-03-13 06:55:59 -04: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
4669b6b985 Fix issue with install batch file detection for Android
#jira UE-89006
#ue4
#android
#rb Brandon.Schaefer

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

[CL 11504758 by chris babcock in 4.25-Plus branch]
2020-02-18 12:57:30 -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
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
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
joseph sozio
529fd4c642 Allow AAB and universal apks to be archived
#ue4
#android
[REVIEW]
#rb Joe.Barrett



#ROBOMERGE-SOURCE: CL 10502352 via CL 10502355 via CL 10502365 via CL 10502395
#ROBOMERGE-BOT: (v606-10482310)

[CL 10502412 by joseph sozio in Main branch]
2019-12-03 17:32:08 -05:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
daniel lamb
b87493929b Fix code only builds.
[REVIEW] Chris.Babcock, Ben.Marsh


#ROBOMERGE-SOURCE: CL 8575338 via CL 8575343 via CL 8575708 via CL 8615689
#ROBOMERGE-BOT: (v409-8614070)

[CL 8617851 by daniel lamb in Main branch]
2019-09-10 14:07:32 -04:00
chris babcock
0b6f91e7d5 Add store version as a comment to main and patch OBB files so they are unique for uploading to Play Store
#jira UE-79037
#ue4
#android
[FYI] Jack.Porter,Allan.Bentham
#rb Jack.Porter

#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 8092125 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8092159 by chris babcock in Main branch]
2019-08-16 12:23:29 -04:00
chris babcock
282ee5f89a Change distribution install batch files to use mkdir/cp instead of mv to intall OBB files to get around new restrictions in Android 9
#jira UE-78912
#ue4
#android
[FYI] Jack.Porter
#rb Thomas.Ross

#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 8042104 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8042139 by chris babcock in Main branch]
2019-08-14 16:19:00 -04:00
chris babcock
5dcfc7d7bf Add support for store version offset by architecture
#jira UE-67565
#ue4
#android
[FYI] Jack.Porter
#rb Thomas.Ross

#ROBOMERGE-SOURCE: CL 7434544 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7434548 by chris babcock in Main branch]
2019-07-17 19:00:37 -04:00
chris babcock
058163c8d8 Generated SymbolizeCrashDump for Android was invalid (Contributed by gaeden)
#jira UE-76452
#PR #5959
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 7095160 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7095167 by chris babcock in Main branch]
2019-06-19 13:33:50 -04:00
chris babcock
d9f497840d Add some more padding to OBB main vs patch file packing when exceeding OBB limit
#android
[REVIEW] [at]Andrew.Grant


#ROBOMERGE-SOURCE: CL 7024000 via CL 7024012 via CL 7024017 via CL 7024023 via CL 7024790
#ROBOMERGE-BOT: (v367-6836689)

[CL 7024838 by chris babcock in Main branch]
2019-06-15 09:59:16 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
chris babcock
1ce0740a65 Add support for embedded builds to optionally append to DisplayName on Android
Provide optional second Gradle invocation after APK generated

#android
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 6451020 via CL 6451037 via CL 6451873

[CL 6451943 by chris babcock in Main branch]
2019-05-14 15:30:43 -04:00
chris babcock
36abe6bc37 Add option to split OBB into main and patch if exceeds OBB size limit
#ue4
#android
[FYI] Jack.Porter
#rb Dmitriy.Dyomin



#ROBOMERGE-SOURCE: CL 6103655 via CL 6103711 via CL 6103784

[CL 6103790 by chris babcock in Main branch]
2019-04-25 23:36:29 -04:00