Commit Graph

1807 Commits

Author SHA1 Message Date
ben marsh
134aa126bc Getting rid of Lumin spam which appears for builds and generating project files for any platform.
#rb none
[FYI] Jason.Bestimt
#jira

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

[CL 5076770 by ben marsh in Dev-VR branch]
2019-02-19 18:04:50 -05:00
ben marsh
3554ddf318 Add Visual Studio 2019 as a compiler for generating intellisense data.
#rb none
#rnx
#jira

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

[CL 5074233 by ben marsh in Dev-VR branch]
2019-02-19 17:33:00 -05:00
ben marsh
a8e4b2ea72 UBT: Don't throw an exception when scanning for restricted folder references from modules that are precompiled; they don't have source code, so won't have a list of source directories.
#rb none
#jira

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

[CL 5034267 by ben marsh in Dev-VR branch]
2019-02-16 07:56:55 -05:00
nick shin
c4d6f2a64a HTML5 - downgrading emscripten back to 1.38.20
- engine changes to use 1.38.20 toolchain

#jira UE-69753  Multithreaded HTML5 loads into a black screen
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4981071 in //UE4/Release-4.22/... via CL 4981072
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5033400 by nick shin in Dev-VR branch]
2019-02-16 07:31:09 -05:00
ben marsh
4bab8246c2 Fix target not being rebuilt when an plugin not required for this platform is disabled. Also add log output showing why a temp target was required.
#rb none
#jira UE-69674

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

[CL 5032625 by ben marsh in Dev-VR branch]
2019-02-16 07:13:43 -05:00
kafumanto
ab99d14f8f PR #5488: Fixed packaging of framework resource bundles when doing a remote build for iOS (Contributed by kafumanto)
#rb none
#jira UE-68921

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

[CL 5030955 by ben marsh in Dev-VR branch]
2019-02-16 05:55:29 -05:00
ben marsh
38a256cfc5 UBT: Fix module manifest not being updated correctly when -ModuleWithSuffix is passed on the command line.
#rb none
#rnx
#jira UE-69366

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

[CL 5030952 by ben marsh in Dev-VR branch]
2019-02-16 05:55:23 -05:00
ben marsh
1de4b01831 Missing file.
#rb none
#jira
#rnx

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

[CL 5030951 by ben marsh in Dev-VR branch]
2019-02-16 05:55:21 -05:00
ben marsh
0872186632 UBT: Add a FileReference.WriteAllBytesIfModified() method to make it easier to update files without modifying the timestamp if they don't change.
#rb none
#jira

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

[CL 5030950 by ben marsh in Dev-VR branch]
2019-02-16 05:55:19 -05:00
ben marsh
b563934691 UBT: Write exception info if XGE fails to start.
#rb none
#rnx
#jira

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

[CL 5030949 by ben marsh in Dev-VR branch]
2019-02-16 05:55:17 -05:00
ben marsh
ba1f76a40c UBT: Update toolset version number for Visual Studio 2019 preview 2.
#rb none
#jira

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

[CL 5030943 by ben marsh in Dev-VR branch]
2019-02-16 05:55:05 -05:00
ben marsh
bc8100f654 UBT: Add a global mutex around UBT initializing the XML config cache. This happens before the global mutex is acquired, so needs to be guarded separately.
#rb none
#jira

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

[CL 5030941 by ben marsh in Dev-VR branch]
2019-02-16 05:55:02 -05:00
ben marsh
f762e27764 UBT: Prevent hot reload attempting to build non-C++ modules.
#rb none
#jira UE-69518

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

[CL 5030939 by ben marsh in Dev-VR branch]
2019-02-16 05:54:58 -05:00
ben marsh
8d5f9f3977 UBT: Fix the user's selected Visual Studio version not being respected when generating project files.
#rb none
#jira UE-69239

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

[CL 5030935 by ben marsh in Dev-VR branch]
2019-02-16 05:54:48 -05:00
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
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
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
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
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
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