Commit Graph

4633 Commits

Author SHA1 Message Date
ben marsh
dd4331aae0 Hack to work around AgentInterface being output by multiple nodes, since it's a runtime dependency of several targets.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5274897 in //UE4/Release-4.22/... via CL 5274898
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5275481 by ben marsh in Dev-VR branch]
2019-03-03 12:59:42 -05:00
ben marsh
450cf6be76 BuildGraph: Fix CopyTask printing source and destination files to the log the wrong way around.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5274873 in //UE4/Release-4.22/... via CL 5274876
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5275475 by ben marsh in Dev-VR branch]
2019-03-03 12:59:40 -05:00
ben marsh
b7dfe5e5f1 Fixes for building lighting using Swarm when done from an editor built with a unique build environment.
* List of dependencies for Lightmass needs to be derived from the engine directory at runtime, rather than assuming that the base directory is Engine/Binaries/Win64.
* AgentInterface.dll is now copied to the same output folder as the editor SwarmInterface DLL at build time, rather than being checked into P4 in two places.

#rb none
#jira UE-70911

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5274269 in //UE4/Release-4.22/... via CL 5274270
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5275430 by ben marsh in Dev-VR branch]
2019-03-03 12:59:28 -05:00
ben marsh
f0f6e5f99c UBT: Include other files in the project directory within the generated projects.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5271663 in //UE4/Release-4.22/... via CL 5271664
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5274343 by ben marsh in Dev-VR branch]
2019-03-01 21:00:32 -05:00
ben marsh
6148d45fb3 Use scoped Windows TRUE and FALSE constants.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5257396 in //UE4/Release-4.22/... via CL 5257411
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5267163 by ben marsh in Dev-VR branch]
2019-03-01 15:08:09 -05:00
graeme thornton
1a551d6144 Minor unrealpak refactor
- Added a "-sign" parameter to enable signing for the given pak. The cached settings in the crypto.json file aren't used to enable signing any more.
 - Encapsulated all signing and encryption keys in a single keychain object which is passed around, rather than individual keys
 - Added some validation to UBT/UAT encryption config parsing so that if you enable any signing or encryption stuff but haven't generated a key, it'll warn and disable everything.

#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5237725 via CL 5237726 via CL 5240337 via CL 5240343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5257171 by graeme thornton in Dev-VR branch]
2019-02-28 18:38:20 -05:00
ben marsh
946b3616ed UBT: Allow modules to disable PCHs entirely by setting PCHUsage = PCHUsageMode.NoPCHs.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5240326 in //UE4/Release-4.22/... via CL 5240327
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5257163 by ben marsh in Dev-VR branch]
2019-02-28 18:38:17 -05:00
chris babcock
ee5949f715 More fallout of merge in GameActivity
- added GameApplication, network change notifications, Firebase, and lifecycle

#android
#rb Pete.Procopio


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5232162 via CL 5238945 via CL 5239022
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5255792 by chris babcock in Dev-VR branch]
2019-02-28 18:24:27 -05:00
ben marsh
dbfeaaaa70 Fixes for running an editor with a unique build environment.
* Add support for running UAT with an absolute path to the editor executable, and pass a full path when cooking or packaging.
* Fix path to the editor executable when launching a standalone editor instance for preview.

#jira UE-70785
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5238647 in //UE4/Release-4.22/... via CL 5238651
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5255169 by ben marsh in Dev-VR branch]
2019-02-28 18:19:06 -05:00
ben marsh
a8b03594aa Fix assumption that editor and ShaderCompileWorker executables are in the same directory. It's possible to build an editor using a unique build environment so that it can be built with custom macros defined, etc...which puts the executable in (ProjectDir)/Binaries/Win64.
Now stores the full path to the shader source directories in the SCW input data archive, and normalizes it again on read.

[CODEREVIEW] Guillaume.Abadie, Rolando.Caloca
#jira UE-70785
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5238601 in //UE4/Release-4.22/... via CL 5238606
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5255166 by ben marsh in Dev-VR branch]
2019-02-28 18:19:00 -05:00
cosmin sulea
b7f0a0428e UE-70475 - Packaging for tvOS from Windows fails with rsync error unless iOS is packaged first
#jira UE-70475
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5238315 in //UE4/Release-4.22/... via CL 5238318
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5255155 by cosmin sulea in Dev-VR branch]
2019-02-28 18:18:52 -05:00
joe conley
2ec2d4738f #jira UE-69839 Lumin fails to launch with assert: ICU data directory was not discovered
NonUFSDebugFiles were getting copied to the staging directory first, but did not respect the "DeployLowerCaseFilenames" setting, and were incorrectly determining the captalization of the Engine/Content directory. Copy them after we copy UFSFiles.

#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 5235658 in //UE4/Release-4.22/... via CL 5235659
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5254738 by joe conley in Dev-VR branch]
2019-02-28 18:12:05 -05:00
josh engebretson
b2f2e6d306 Skip android test installation batch files during gauntlet build discovery
[FYI] clayton.langford

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 5228413 via CL 5228420 via CL 5229166 via CL 5233431
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5254365 by josh engebretson in Dev-VR branch]
2019-02-28 18:08:31 -05:00
chris babcock
0871e6f419 Fix default superclass for GameActivity
#android


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5226789 via CL 5228894 via CL 5233062
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5253788 by chris babcock in Dev-VR branch]
2019-02-28 18:03:24 -05:00
bob tellez
82d4827405 Merging CL#5206353
Handle alternative splash screen resources removal

#android
[FYI] Andrew.Grant


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5210370 via CL 5212582 via CL 5231377
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5249607 by bob tellez in Dev-VR branch]
2019-02-28 17:33:34 -05:00
anthony bills
b2616cd708 [AutomationTool] Add support to override the launch command line per platform.
#rb david.harvey
[FYI] andrew.grant

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 5206466 via CL 5211320 via CL 5230557
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5248616 by anthony bills in Dev-VR branch]
2019-02-28 17:28:15 -05:00
josh adams
019c12863e - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
ben marsh
644ab189e7 Add a better error message when trying to use a module that is not included in an installed build.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5215521 in //UE4/Release-4.22/... via CL 5225284
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5243533 by ben marsh in Dev-VR branch]
2019-02-28 17:00:30 -05:00
ben marsh
9ffced0fd0 Remove other references to RPCUtility
#rb none
#jira UE-70509

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5174748 in //UE4/Release-4.22/... via CL 5207574
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223717 by ben marsh in Dev-VR branch]
2019-02-26 22:33:35 -05:00
ben marsh
7011863b74 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5174514 in //UE4/Release-4.22/... via CL 5207569
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223716 by ben marsh in Dev-VR branch]
2019-02-26 22:33:33 -05:00
cosmin sulea
6975da3aea UE-69280 - iOS Launch On Fails on Windows binary builds
UE-69887 - DeploymentServerLauncher.exe does not always quit
#jira UE-69280
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5143595 in //UE4/Release-4.22/... via CL 5207125
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223586 by cosmin sulea in Dev-VR branch]
2019-02-26 22:29:40 -05:00
michael trepka
f5750d2291 Make 10.13.6 the minimum version of macOS required by UE4 for games and the editor
#jira none
#rb Mark.Satterthwaite

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 5112753 in //UE4/Release-4.22/... via CL 5206605
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223444 by michael trepka in Dev-VR branch]
2019-02-26 22:24:26 -05:00
ben marsh
516cfb655a UAT: Prevent temp-target files from having their timestamps updated even when the contents don't change. Causes unnecessary rebuilds when working with content-only projects.
#rb none
#jira UE-70371

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5107983 in //UE4/Release-4.22/... via CL 5206549
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223429 by ben marsh in Dev-VR branch]
2019-02-26 22:23:50 -05:00
ben marsh
a71cccf805 Fix Gauntlet automation DLLs being output to the {WorkspaceRoot}\Binaries\DotNET directory rather than Engine\Binaries\DotNET.
Seems to get copied into the correct place because it's referenced by GauntletExtras anyway, just creates some junk in the workspace root directory.

[FYI] Arciel.Rekman, Andrew.Grant
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5200767 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223266 by ben marsh in Dev-VR branch]
2019-02-26 22:17:29 -05:00
ben marsh
ac349c1ce9 Add a flag which allows overriding the shared compile environment with custom build settings.
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5200081 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223256 by ben marsh in Dev-VR branch]
2019-02-26 22:17:10 -05:00