Commit Graph

84 Commits

Author SHA1 Message Date
ben marsh
3028faba18 Trigger a link error whenever a module is missing a valid IMPLEMENT_MODULE macro on Windows.
The IMPLEMENT_MODULE macro now defines an empty function called IMPLEMENT_MODULE_{ModuleName}, to which we force a reference to via the linker command line. This behavior can be disabled on a per-module basis by setting bRequiresImplementModule = false from a .build.cs file.

#rb none

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

[CL 4830013 by ben marsh in Dev-Networking branch]
2019-01-29 05:14:09 -05:00
James Hopkin
51d5e59cbe Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
#lockdown: Nick.Penwarden
#rb integration


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4828298 by James Hopkin in Dev-Networking branch]
2019-01-29 04:28:43 -05:00
ryan vance
398a8c4814 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

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

[CL 4824878 by ryan vance in Dev-Networking branch]
2019-01-28 16:32:53 -05:00
ben marsh
957ba66764 Change default Windows toolchain to 14.16.27023 (from VS2017 15.9.4).
Should fix periodic linker errors, as described here https://developercommunity.visualstudio.com/content/problem/225957/fatal-error-lnk1318-unexpected-pdb-error-ok-0.html.

#rb none
#jira UE-60424
#rnx

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

[CL 4820200 by ben marsh in Dev-Networking branch]
2019-01-26 06:29:27 -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
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
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
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
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
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
chris babcock
993f55695f Remove SDK missing error if Gradle enabled since it can download it if necessary
#jira UE-68588
#ue4
#android
#rb John.Mauney

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

[CL 4736208 by chris babcock in Dev-Networking branch]
2019-01-16 15:43:06 -05:00
david hamm
c75081b36f Added support for using display cutout region on Android
- added new project setting bUseDisplayCutout
- temporary restriction to HUAWEI devices for this release (remove later)

#android
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4732433 via CL 4732462 via CL 4732476 via CL 4732493 via CL 4732510
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4732567 by david hamm in Dev-Networking branch]
2019-01-16 10:14:53 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

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

[CL 4718825 by ben marsh in Dev-Networking branch]
2019-01-14 12:15:37 -05:00
lina halper
76003579dd Copying //UE4/Dev-Anim to Main (//UE4/Main)
[FYI] Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4715449 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4715461 by lina halper in Dev-Networking branch]
2019-01-11 22:36:30 -05:00
jamie dale
ada99be1e6 Avoid passing Objective-C exception flags to .c files as they emit an unused argument warning
#rb Peter.Sauerbrei

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4714665 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4714666 by jamie dale in Dev-Networking branch]
2019-01-11 18:09:48 -05:00
ryan gerleve
b41214417e Resolving conflict from Dev-Enterprise.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


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

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]
2019-01-11 14:26:15 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
2019-01-11 02:57:03 -05:00
ben marsh
c39142c8c7 UBT: Use the 6.00 version of Clang by default on Windows, until fixes for newer versions have been merged into Main.
#rb none
#lockdown Nick.Penwarden

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

[CL 4677460 by ben marsh in Dev-Networking branch]
2019-01-02 18:19:08 -05:00
chris gagnon
aad5335ff6 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

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

[CL 4676943 by chris gagnon in Dev-Networking branch]
2019-01-02 15:37:07 -05:00