izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
47,035 Commits 23 Branches 254 Tags
8ba99b94dea0e126ab6da39a8428887ef22d14f5
Commit Graph

4576 Commits

Author SHA1 Message Date
josh adams
8ba99b94de - Proper fix to merge conflicts 
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]
 2019-02-16 07:13:44 -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
bob tellez
1d031bb7be Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS 
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032623 by bob tellez in Dev-VR branch]
 2019-02-16 07:13:40 -05:00
arciel rekman
75cd110161 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031241 by arciel rekman in Dev-VR branch]
 2019-02-16 06:06:55 -05:00
arciel rekman
7eea5d5946 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031233 by arciel rekman in Dev-VR branch]
 2019-02-16 06:06:36 -05:00
josh adams
ba53727028 - 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: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031108 by josh adams in Dev-VR branch]
 2019-02-16 06:02:18 -05:00
ben marsh
20590a9f8e Fix ue4commandline.txt being written to engine directory during staging. 
#rb none
#jira UE-69193

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

[CL 5031097 by ben marsh in Dev-VR branch]
 2019-02-16 06:01:14 -05:00
arciel rekman
b83639afd6 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031096 by arciel rekman in Dev-VR branch]
 2019-02-16 06:01:10 -05:00
ben marsh
cb30f24af1 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4962306 in //UE4/Release-4.22/... via CL 4968534
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030973 by ben marsh in Dev-VR branch]
 2019-02-16 05:56:06 -05:00
ben marsh
c11b59fbd4 Missing copyright notice. 
#rb none
#rnx
#jira

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

[CL 5030959 by ben marsh in Dev-VR branch]
 2019-02-16 05:55:38 -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
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