Commit Graph

5857 Commits

Author SHA1 Message Date
daniel lamb
766d638977 Added support for querying for updates from our backend.
#RB Andrew.Grant

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4974614 via CL 4975418 via CL 4976676
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5057134 by daniel lamb in Dev-Core branch]
2019-02-18 19:39:59 -05:00
josh adams
f13da13e76 - Final fix now for merge issue (I had compiled wrong program to test my fix, oops)
#jira none
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4975198 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056967 by josh adams in Dev-Core branch]
2019-02-18 19:38:10 -05:00
josh adams
ecd44e7703 - Proper fix to merge conflicts
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056898 by josh adams in Dev-Core branch]
2019-02-18 19:37:05 -05:00
ben marsh
9d5b398521 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: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4974444 in //UE4/Release-4.22/... via CL 4974445
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056897 by ben marsh in Dev-Core branch]
2019-02-18 19:37:03 -05:00
bob tellez
2ef13ee02b Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056895 by bob tellez in Dev-Core branch]
2019-02-18 19:37:00 -05:00
arciel rekman
30667d0e7c PhysX: change v13 Linux toolchain to v12 one (for real).
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055239 by arciel rekman in Dev-Core branch]
2019-02-18 19:05:42 -05:00
arciel rekman
a3e0161d9e PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055223 by arciel rekman in Dev-Core branch]
2019-02-18 19:04:53 -05:00
josh adams
641c6a16db - Memory Mapped IO enabled on IOS for Audio (via ini and platform property)
- -nommio on the commandline will disble it for testing
#rb gil.gribb

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055189 by josh adams in Dev-Core branch]
2019-02-18 19:04:03 -05:00
ben marsh
87fda12955 Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

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

[CL 5055178 by ben marsh in Dev-Core branch]
2019-02-18 19:03:41 -05:00
arciel rekman
63a5bfe447 PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#jira UE-69848
#rb Ben.Marsh
#rnx

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

[CL 5055177 by arciel rekman in Dev-Core branch]
2019-02-18 19:03:39 -05:00
ben marsh
29aef74b8b Fix exception when building into a clean workspace, due to project intermediate directory not existing. This mirrors the behavior of BinaryFormatterUtils.Save() to BinaryFormatterUtils.SaveIfDifferent().
#rb none
#jira UE-69878

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

[CL 5055151 by ben marsh in Dev-Core branch]
2019-02-18 19:02:27 -05:00
ben marsh
53e105b75d Missing copyright notice.
#rb none
#rnx
#jira

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

[CL 5055137 by ben marsh in Dev-Core branch]
2019-02-18 19:02:03 -05:00
kafumanto
e73f7d6741 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: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4957419 in //UE4/Release-4.22/... via CL 4968448
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055131 by ben marsh in Dev-Core branch]
2019-02-18 19:01:53 -05:00
ben marsh
1f67a87b71 UBT: Fix module manifest not being updated correctly when -ModuleWithSuffix is passed on the command line.
#rb none
#rnx
#jira UE-69366

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

[CL 5055128 by ben marsh in Dev-Core branch]
2019-02-18 19:01:48 -05:00
ben marsh
8386f92523 Missing file.
#rb none
#jira
#rnx

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

[CL 5055127 by ben marsh in Dev-Core branch]
2019-02-18 19:01:46 -05:00
ben marsh
8740aef93b 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: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4957014 in //UE4/Release-4.22/... via CL 4968438
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055126 by ben marsh in Dev-Core branch]
2019-02-18 19:01:44 -05:00
ben marsh
8cf2571348 UBT: Write exception info if XGE fails to start.
#rb none
#rnx
#jira

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

[CL 5055125 by ben marsh in Dev-Core branch]
2019-02-18 19:01:42 -05:00
ben marsh
72bea63142 UBT: Update toolset version number for Visual Studio 2019 preview 2.
#rb none
#jira

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

[CL 5055119 by ben marsh in Dev-Core branch]
2019-02-18 19:01:31 -05:00
ben marsh
0c60041de3 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: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4953078 in //UE4/Release-4.22/... via CL 4968356
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055117 by ben marsh in Dev-Core branch]
2019-02-18 19:01:28 -05:00
ben marsh
90040a1a8d UBT: Prevent hot reload attempting to build non-C++ modules.
#rb none
#jira UE-69518

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

[CL 5055112 by ben marsh in Dev-Core branch]
2019-02-18 19:01:24 -05:00
ben marsh
aefdfc14fd UBT: Fix the user's selected Visual Studio version not being respected when generating project files.
#rb none
#jira UE-69239

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

[CL 5055103 by ben marsh in Dev-Core branch]
2019-02-18 19:00:42 -05:00
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