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
Files
8ba99b94dea0e126ab6da39a8428887ef22d14f5
UnrealEngineUWP/Engine/Source/Programs
History
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
..
AutomationTool
- Proper fix to merge conflicts
2019-02-16 07:13:44 -05:00
AutomationToolLauncher
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BlankProgram
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BreakpadSymbolEncoder
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildPatchTool
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CrashReportClient
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
DotNETCommon
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().
2019-02-16 05:56:06 -05:00
GitDependencies
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
HTML5/HTML5LaunchHelper
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ImageValidator
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
IncludeTool
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
IOS
Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
2019-02-16 03:34:49 -05:00
Mac
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MayaLiveLinkPlugin
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MemoryProfiler2
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MinidumpDiagnostics
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
nDisplayLauncher
Copy from //Tasks/UE4/Partner-vrCluster
2019-02-16 03:34:54 -05:00
nDisplayListener
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
NetworkProfiler
Copying //UE4/Dev-Networking to Dev-Main (//UE4/Dev-Main) [at] 4804506
2019-01-24 16:28:06 -05:00
PixelStreaming
Copied from Dev-Enterprise - Fixed some compile errors in the WebRTCProxy caused by increased warning level.
2019-02-04 10:12:30 -05:00
ReplayServer
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RPCUtility
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ShaderCompileWorker
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
2019-01-30 21:24:04 -05:00
SlateViewer
Copying //UE4/Dev-Networking to Dev-Main (//UE4/Dev-Main) [at] 4804506
2019-01-24 16:28:06 -05:00
SymbolDebugger
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
TestPAL
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-29 17:41:46 -05:00
UnrealBuildTool
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.
2019-02-16 07:13:43 -05:00
UnrealCEFSubProcess
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
UnrealControls
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UnrealFileServer
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UnrealFrontend
Fix broken icons in UnrealFrontend.
2019-01-30 02:10:16 -05:00
UnrealGameSync
UGS: Fix compilation errors when DeploymentSettingsInternal.cs is not present.
2019-02-16 03:50:41 -05:00
UnrealHeaderTool
Refactored structs to reduce executable space from UHT-generated code tables.
2019-01-24 14:36:34 -05:00
UnrealHitchParser
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UnrealLightmass
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
2019-01-30 21:24:04 -05:00
UnrealMultiUserServer
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UnrealPak
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
UnrealSwarm
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
2019-01-30 21:24:04 -05:00
UnrealVersionSelector
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
UnrealVS
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UnrealWatchdog
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
Windows/BootstrapPackagedGame
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00