Commit Graph

4557 Commits

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

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4950441 in //UE4/Release-4.22/... via CL 4950443
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026766 by arciel rekman in Dev-VR branch]
2019-02-16 03:50:42 -05:00
ben marsh
a1a0b4cbe5 UGS: Fix compilation errors when DeploymentSettingsInternal.cs is not present.
#rb none
#rnx
#jira UE-69781

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

[CL 5026765 by ben marsh in Dev-VR branch]
2019-02-16 03:50:41 -05:00
jerome delattre
94d70d4786 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: ryan.vance
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4947691 in //UE4/Release-4.22/... via CL 4947693
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026232 by jerome delattre in Dev-VR branch]
2019-02-16 03:34:54 -05:00
jack porter
237365f22d 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: ryan.vance
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/... via CL 4947306
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026229 by jack porter in Dev-VR branch]
2019-02-16 03:34:49 -05:00
david harvey
6aba7c3e99 enable XMA2 streaming on platforms that support it
#rb aaron.mcleran

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4935528 via CL 4935535 via CL 4940171 via CL 4941360
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5023420 by david harvey in Dev-VR branch]
2019-02-16 02:52:18 -05:00
david harvey
a0b04cab91 add missing XMA2 streaming define, currently disabled.
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4931727 via CL 4931729 via CL 4939897 via CL 4939959
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5022678 by david harvey in Dev-VR branch]
2019-02-16 02:40:24 -05:00
brandon schaefer
f127c00866 Disable XGE when building on Linux for Android
#jira UE-69732
#rb Arciel.Rekman

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4936860 in //UE4/Release-4.22/... via CL 4936862
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5022140 by brandon schaefer in Dev-VR branch]
2019-02-16 02:33:43 -05:00
nick shin
d798fb2ecc 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: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4925927 in //UE4/Release-4.22/... via CL 4925930
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017756 by nick shin in Dev-VR branch]
2019-02-16 01:26:42 -05:00
ben marsh
29893a312d Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5016545 by ben marsh in Dev-VR branch]
2019-02-16 01:12:51 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
2019-02-06 13:27:58 -05:00
ben marsh
6b417a0b2f Add missing copyright notice.
#rb none
#rnx

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

[CL 4912971 by ben marsh in Dev-VR branch]
2019-02-05 18:55:39 -05:00
ben marsh
d5f04b3023 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912546 by ben marsh in Dev-VR branch]
2019-02-05 18:49:22 -05:00
ben marsh
764c622bbc 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912487 by ben marsh in Dev-VR branch]
2019-02-05 18:49:07 -05:00
dominic barile
9476fa5b64 Made SaveRoleArtifacts virtual so it can be overridden
#rb William.Ewen, Andrew.Grant
[CODEREVIEW] William.Ewen, Andrew.Grant

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: dominic.barile
#ROBOMERGE-SOURCE: CL 4887792 via CL 4893034 via CL 4893147
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4908256 by dominic barile in Dev-VR branch]
2019-02-05 18:31:48 -05:00
nick shin
5b77cf659c 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: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890171 in //UE4/Release-4.22/... via CL 4890177
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4890181 by nick shin in Dev-VR branch]
2019-02-04 15:04:33 -05:00
nick shin
063b0f86c1 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: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890103 in //UE4/Release-4.22/... via CL 4890108
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4890114 by nick shin in Dev-VR branch]
2019-02-04 15:01:19 -05:00
jerome delattre
8ef6754c31 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: ryan.vance
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4883268 in //UE4/Release-4.22/... via CL 4883270
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4883275 by jerome delattre in Dev-VR branch]
2019-02-04 10:12:30 -05:00
daniel lamb
397bd45134 [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: ryan.vance
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4869450 via CL 4873808 via CL 4877426
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4877439 by daniel lamb in Dev-VR branch]
2019-02-02 10:11:55 -05:00
ben marsh
d8b6de1e2f 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4877079 in //UE4/Release-4.22/... via CL 4877081
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4877087 by ben marsh in Dev-VR branch]
2019-02-01 23:05:09 -05:00
andrew grant
2a2d69a419 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: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861596 via CL 4867071 via CL 4868435 via CL 4873931
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4874093 by andrew grant in Dev-VR branch]
2019-02-01 19:02:29 -05:00
andrew grant
7a42f01705 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: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861589 via CL 4867069 via CL 4868434 via CL 4873925
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4874092 by andrew grant in Dev-VR branch]
2019-02-01 19:02:27 -05:00
michael kirzinger
2fa95114f0 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
Source: //UE4/Dev-Online 4860295

#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 4860323 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4860333 by michael kirzinger in Dev-VR branch]
2019-01-31 15:09:49 -05:00
andrew grant
9bfd0a7fee Made Gauntlet's build path source support multiple folders to search. This is to better support packaged builds which end up in Binaries/<platform> so they can be found at the same time as staged builds without moving them under /saved
-build=local is now a (clearer) synonym for -build=staged. Both will search /Saved/StagedBuilds and /Binaries for matching builds


[at]josh.engebretson
#tests BuildCookFort and RunFort with Android

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4858090 via CL 4858092 via CL 4858870 via CL 4859004
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4859110 by andrew grant in Dev-VR branch]
2019-01-31 11:59:27 -05:00
jamie dale
6072ce9820 Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4858896 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4858899 by jamie dale in Dev-VR branch]
2019-01-31 11:36:22 -05:00
marcus wassmer
b259f65406 Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4854570 by marcus wassmer in Dev-VR branch]
2019-01-30 21:24:04 -05:00