Commit Graph

5812 Commits

Author SHA1 Message Date
arciel rekman
5bd14d1ec6 Linux: harden the UBT makefile generator against .target.cs
#rb none
#jira none
[FYI] Brandon.Schaefer

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4950441 in //UE4/Release-4.22/... via CL 4950443
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5053310 by arciel rekman in Dev-Core branch]
2019-02-18 18:11:48 -05:00
ben marsh
1c2e958e3c UGS: Fix compilation errors when DeploymentSettingsInternal.cs is not present.
#rb none
#rnx
#jira UE-69781

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4950439 in //UE4/Release-4.22/... via CL 4950442
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5053309 by ben marsh in Dev-Core branch]
2019-02-18 18:11:46 -05:00
jerome delattre
a3eddf67be Copy from //Tasks/UE4/Partner-vrCluster
nDisplayLauncher - Removed OpenGL3 RHI option from the launcher

#author Andrey.Yamashev
#jira UE-66756
#rb simon.tourangeau

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4947691 in //UE4/Release-4.22/... via CL 4947693
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5053145 by jerome delattre in Dev-Core branch]
2019-02-18 18:03:46 -05:00
jack porter
37e649d228 Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
Rebuild DeploymentServer
[FYI] Cosmin.Sulea
#rb None
#jira UE-69615

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/... via CL 4947306
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5053140 by jack porter in Dev-Core branch]
2019-02-18 18:03:40 -05:00
david harvey
c91d6e71ab enable XMA2 streaming on platforms that support it
#rb aaron.mcleran

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4935528 via CL 4935535 via CL 4940171 via CL 4941360
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5052329 by david harvey in Dev-Core branch]
2019-02-18 17:43:45 -05:00
david harvey
92bf13ad04 add missing XMA2 streaming define, currently disabled.
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4931727 via CL 4931729 via CL 4939897 via CL 4939959
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5052052 by david harvey in Dev-Core branch]
2019-02-18 17:39:33 -05:00
brandon schaefer
23be84d6fa Disable XGE when building on Linux for Android
#jira UE-69732
#rb Arciel.Rekman

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4936860 in //UE4/Release-4.22/... via CL 4936862
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5051658 by brandon schaefer in Dev-Core branch]
2019-02-18 17:36:01 -05:00
nick shin
c563b94f08 HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade
also, inform developer about the long link time

#jira UE-69632  Multithreaded adds 8.5 minutes to Launch On
#rnx
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4925927 in //UE4/Release-4.22/... via CL 4925930
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5048993 by nick shin in Dev-Core branch]
2019-02-18 17:07:11 -05:00
ben marsh
55cd1e07bf Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5048841 by ben marsh in Dev-Core branch]
2019-02-18 17:01:55 -05:00
daniel lamb
792a8cd39e Prevented server from compressing pak files.
Enabled compression on windows for some pak files.

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4905053 via CL 4916232 via CL 4916287
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5016760 by daniel lamb in Dev-Core branch]
2019-02-16 01:14:46 -05:00
ben marsh
6d2b9bfa53 Minor fix for incorrect error message when a file reference parameter is missing in UAT.
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4899115 via CL 4905888 via CL 4909986
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5015791 by ben marsh in Dev-Core branch]
2019-02-16 01:05:38 -05:00
ben marsh
fb87af96a2 Merging latest UGS code from Dev-Build.
#rb none
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4905102 in //UE4/Release-4.22/... via CL 4905107
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5015168 by ben marsh in Dev-Core branch]
2019-02-16 00:59:35 -05:00
Steve Robb
09166f4e44 Removal of obsolete error, as UCLASSes can now be defined in any header, not just one entitled <ClassNameWithNoPrefix>.h.
#rb johan.torp

[CL 4947302 by Steve Robb in Dev-Core branch]
2019-02-08 07:33:23 -05:00
ben marsh
df5c6a2906 Add missing copyright notice.
#rb none
#rnx

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4897786 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947125 by ben marsh in Dev-Core branch]
2019-02-08 06:21:11 -05:00
ben marsh
34edeac563 Parse out a sorted list of classes and functions from the MSVC timing info. Groups templates together, to allow better understanding the most expensive code to compile.
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947080 by ben marsh in Dev-Core branch]
2019-02-08 06:17:34 -05:00
ben marsh
18f03be4dc UAT: Add a build command to parse the output from MSVC's /d1reportTime argument, and convert it into a trace that can be visualized in Chrome's chrome://tracing tab.
To generate an input file, compile a single file with UnrealBuildTool and redirect the output to a text file:

    UnrealBuildTool.exe UE4Editor Win64 Development -SingleFile="E:\P4\Engine\Source\Runtime\Core\Private\Misc\CoreGlobals.cpp" -Timing > E:\Output.txt

To convert into a trace readable by chrome:

   AutomationTool.exe ParseMsvcTimingInfo -File=E:\Output.txt

Output file will be written to the same directory as the input file, but with a json extension.

#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947067 by ben marsh in Dev-Core branch]
2019-02-08 06:16:41 -05:00
dominic barile
b65e81822d Made SaveRoleArtifacts virtual so it can be overridden
#rb William.Ewen, Andrew.Grant
[CODEREVIEW] William.Ewen, Andrew.Grant

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: dominic.barile
#ROBOMERGE-SOURCE: CL 4887792 via CL 4893034 via CL 4893147
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946762 by dominic barile in Dev-Core branch]
2019-02-08 05:58:26 -05:00
nick shin
5b1df4cee9 HTML5 - emscripten toolchain upgrade 1.38.24
epic edits for coolchain upgrade

#jira UEMOB-475 Upgrade UE4 HTML5 toolchain to support multithreading
[RN]
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890171 in //UE4/Release-4.22/... via CL 4890177
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946609 by nick shin in Dev-Core branch]
2019-02-08 05:43:56 -05:00
nick shin
c9e7ac279b HTML5 - fix log spam
replicated to //UE4/Release-4.22

#jira UE-68969  HTML5 logspam when packaging/launching: NOTE[ReadEmscriptenConfigFile]: using EM_CONFIG
#rb none
#rnx

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890103 in //UE4/Release-4.22/... via CL 4890108
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946605 by nick shin in Dev-Core branch]
2019-02-08 05:43:34 -05:00
jerome delattre
c687c75fc9 Copied from Dev-Enterprise - Fixed some compile errors in the WebRTCProxy caused by increased warning level.
#author Stuart.Hill
#rb Alistair.White
#jira UE-69338

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4883268 in //UE4/Release-4.22/... via CL 4883270
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946519 by jerome delattre in Dev-Core branch]
2019-02-08 05:39:17 -05:00
daniel lamb
dc440a93f6 [CODEREVIEW] daniel.lamb,jeff.williams
Merge conflict.
daniel.lamb, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs - merging //Fortnite/Dev-EngineMerge/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs#2


--------------------------------------
Create labels for content builds.
#rb William.Ewen

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4869450 via CL 4873808 via CL 4877426
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946240 by daniel lamb in Dev-Core branch]
2019-02-08 05:23:27 -05:00
ben marsh
f3c85ec400 UBT: Prevent DebugGame compile environment from having different ORIGINAL_FILE_NAME macro to the development build environment. This is only needed when compiling resources for binaries. Also prevent the precompiled manifest being written to if it doesn't change.
#rb none
#jira UE-69434

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4877079 in //UE4/Release-4.22/... via CL 4877081
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946236 by ben marsh in Dev-Core branch]
2019-02-08 05:23:20 -05:00
andrew grant
20f2281d85 Gauntlet -
Moved SubmitToDashboard into its own function to ensure derived classes don't accidentally skip it.
Renamed a few classes for future work

[at]ben.salem [at]clayton.langford

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861596 via CL 4867071 via CL 4868435 via CL 4873931
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946049 by andrew grant in Dev-Core branch]
2019-02-08 05:15:13 -05:00
andrew grant
2e3dc7d1da Gauntlet -
native plugin now marked as runtime so it's available in more builds.
android device now uses a path under the Gauntlet tempdir for pulling artifacts. Dir is also marked for cleanup.


#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861589 via CL 4867069 via CL 4868434 via CL 4873925
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4946048 by andrew grant in Dev-Core branch]
2019-02-08 05:15:11 -05:00
david harvey
006ec9b620 enable XMA2 streaming on platforms that support it
#rb aaron.mcleran


#ROBOMERGE-SOURCE: CL 4935528 via CL 4935535 via CL 4940171

[CL 4941360 by david harvey in Main branch]
2019-02-07 20:55:21 -05:00