Commit Graph

4480 Commits

Author SHA1 Message Date
ben marsh
27de437fb8 UBT: Validate that runtime dependencies from restricted folders are not copied into public folders.
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4820177 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4820182 by ben marsh in Dev-Networking branch]
2019-01-26 06:24:34 -05:00
chris babcock
712764c29e Fix Mali debugger paths to work on Mac and Linux
#jira UE-69111
#ue4
#android
[FYI] Jack.Porter
#rb trivial


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4818008 via CL 4819577 via CL 4819597
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4819623 by chris babcock in Dev-Networking branch]
2019-01-25 23:00:23 -05:00
josh engebretson
d2c444795c Gauntlet: Remove workaround for missing log, add changes in UnrealSession missed in previous commit
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 4813043 via CL 4815245 via CL 4815460
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4815604 by josh engebretson in Dev-Networking branch]
2019-01-25 15:59:36 -05:00
ben marsh
0814ccc88b Fix executables not being rebuilt whenever the user's selected icon changes on Windows.
* The icon file is now added as a dependency when compiling resource files.
* The path to the chosen icon file is saved into an "external build metadata" section of the makefile, so that removing or adding the file can cause the makefile to be invalidated on startup.

#rb none
#jira UE-68906

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4812841 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4812847 by ben marsh in Dev-Networking branch]
2019-01-25 12:08:08 -05:00
chris babcock
4d71b6100f Validate Android NDK before before compiling
#jira UE-68866
#ue4
#android
[FYI] Jack.Porter
#rb John.Mauney


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4805920 via CL 4805924 via CL 4805926 via CL 4808586 via CL 4808710
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4808739 by chris babcock in Dev-Networking branch]
2019-01-25 04:27:02 -05:00
rob gay
3a88b54176 Copying //UE4/Dev-Audio to Dev-Main (//UE4/Dev-Main) Souce CL: 4806741
#rb aaron.mcleran
#lockdown aaron.mcleran

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 4806765 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806770 by rob gay in Dev-Networking branch]
2019-01-24 20:59:01 -05:00
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
2019-01-24 20:39:08 -05:00
andrew grant
71f1425fb6 Added GetCachedConfig accessor to prevent multiple configs being constructed.
#rb na

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4800128 via CL 4800129 via CL 4803111 via CL 4804853
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4805037 by andrew grant in Dev-Networking branch]
2019-01-24 16:33:25 -05:00
steve robb
d42cd122bf Refactored structs to reduce executable space from UHT-generated code tables.
#rb robert.manuszewski
[FYI] peter.sauerbrei


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4784689 via CL 4789908 via CL 4794430
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4803761 by steve robb in Dev-Networking branch]
2019-01-24 15:50:36 -05:00
ryan gerleve
efd1e98234 Resolving conflict.
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1


--------------------------------------
Copying //UE4/Dev-Enterprise [at] cl 4784880 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788073 by ryan gerleve in Dev-Networking branch]
2019-01-23 16:05:15 -05:00
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
2019-01-23 09:49:18 -05:00
ben marsh
274f393899 Convert project file path to absolute before passing on the command line to UBT.
#rb none
#jira UE-68863

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4771381 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782695 by ben marsh in Dev-Networking branch]
2019-01-23 09:49:02 -05:00
ben marsh
02577b4e35 Fix comment.
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4761641 via CL 4761649 via CL 4761658
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4761662 by ben marsh in Dev-Networking branch]
2019-01-21 11:20:39 -05:00
graeme thornton
0fb3354acc When adding additional files to the UFS staging list, omit movie files on dedicated servers
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 4760621 via CL 4760623 via CL 4760625 via CL 4760626
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4760627 by graeme thornton in Dev-Networking branch]
2019-01-21 08:44:22 -05:00
ben marsh
98ec1c5ec9 UAT: Use Dns.GetHostName() rather than Environment.MachineName to determine the hostname for matching P4 clients. Environment.MachineName is the short NETBIOS name, and may not include the ".local" suffix typical on Mac.
#rb none
#jira UE-68746

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758191 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758192 by ben marsh in Dev-Networking branch]
2019-01-18 21:56:22 -05:00
ben marsh
1f428244a7 Fix hot reload from IDE for DebugGame targets. Now that UE4Editor has a separate executable in DebugGame, we have to check for it running when starting a build/
#rb none
#jira UE-67911

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758134 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758135 by ben marsh in Dev-Networking branch]
2019-01-18 21:31:48 -05:00
ben marsh
32b42c1e58 CrashReportClient: Grey out the option to opt-out of being contacted for internal engine builds.
#rb none
#jira UE-68745

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758106 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758110 by ben marsh in Dev-Networking branch]
2019-01-18 21:16:26 -05:00
ben marsh
a931d5f5bf UBT: Add support for Aras-P's -ftime-trace PR for Clang, which outputs a JSON file containing a timeline for the compile. See http://aras-p.info/blog/2019/01/16/time-trace-timeline-flame-chart-profiler-for-Clang/ for more info.
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4757790 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4757801 by ben marsh in Dev-Networking branch]
2019-01-18 20:24:36 -05:00
aaron mcleran
ed7878cd8f Implementing cook-time analysis data
#rb Ethan.Geller

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 4748946 via CL 4748948 via CL 4748951 via CL 4748954
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4748970 by aaron mcleran in Dev-Networking branch]
2019-01-17 19:53:03 -05:00
peter sauerbrei
eef12e461f fix for minimum version we support for TVOS
#jira UE-68514
#rb john.mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 4744409 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4744412 by peter sauerbrei in Dev-Networking branch]
2019-01-17 13:10:29 -05:00
Peter Engstrom
39c0dc7067 Programs need to build with support for developer tools in order to get all SlateEditorStyle code..
TODO: Be more restrictive about SlateReflector's use of MessageLog so that there's no dependency on EditorStyle unless needed.

#rb matt.kuhlenschmidt

[CL 4742927 by Peter Engstrom in Dev-Networking branch]
2019-01-17 10:52:45 -05:00
chris babcock
304989fcdd Fix issue with compiler executable paths with spaces on Android
#jira UE-68380
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4738473 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4738476 by chris babcock in Dev-Networking branch]
2019-01-16 22:01:02 -05:00
ben marsh
0b32cd5b67 Fix command line arguments not being split by delimiter characters, and revert CL 4737886.
#rb none
[FYI] Chris.Babcock

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4738035 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4738036 by ben marsh in Dev-Networking branch]
2019-01-16 20:06:48 -05:00
chris babcock
f20f3a6362 Fix issue with -Architectures and GPUArchitectures not being split properly
#jira UE-68518
#ue4
#android
[FYI] Ben.Marsh
#rb John.Mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4737886 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4737889 by chris babcock in Dev-Networking branch]
2019-01-16 19:29:56 -05:00
ben marsh
5cbdbd4599 Disable warnings about unused arguments when generating project files. We do additional argument parsing after the point that the warning is output.
#rb none
#jira UE-68511

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4737711 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4737714 by ben marsh in Dev-Networking branch]
2019-01-16 18:36:29 -05:00