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
26db8ffee8a69c74a130d9d6d074e36619e7c239
UnrealEngineUWP/Engine/Source/Programs
History
josh adams 26db8ffee8 - Proper fix to merge conflicts 
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5077348 by josh adams in Dev-Networking branch]
2019-02-19 18:11:13 -05:00
..
AutomationTool
- Proper fix to merge conflicts
2019-02-19 18:11:13 -05:00
AutomationToolLauncher
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
BlankProgram
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
BreakpadSymbolEncoder
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
BuildPatchTool
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
CrashReportClient
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -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-19 17:26:14 -05:00
GitDependencies
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
HTML5/HTML5LaunchHelper
Update default copyright notices for C# projects.
2018-12-18 14:08:17 -05:00
ImageValidator
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
IncludeTool
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
IOS
Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
2019-02-19 16:05:13 -05:00
Mac
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
MayaLiveLinkPlugin
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
MemoryProfiler2
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
MinidumpDiagnostics
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
nDisplayLauncher
Copy from //Tasks/UE4/Partner-vrCluster
2019-02-19 16:05:19 -05:00
nDisplayListener
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
NetworkProfiler
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
PixelStreaming
Copied from Dev-Enterprise - Fixed some compile errors in the WebRTCProxy caused by increased warning level.
2019-02-04 12:51:25 -05:00
ReplayServer
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
RPCUtility
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ShaderCompileWorker
Fix merge conflict
2019-01-31 12:42:57 -05:00
SlateViewer
Programs need to build with support for developer tools in order to get all SlateEditorStyle code..
2019-01-17 10:52:45 -05:00
SymbolDebugger
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
TestPAL
Removing reference to hardcoded Steam path from dll loading test in pal app.
2019-02-01 22:08:41 -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-19 18:11:11 -05:00
UnrealCEFSubProcess
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
UnrealControls
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
UnrealFileServer
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealFrontend
Fix broken icons in UnrealFrontend.
2019-01-30 02:10:27 -05:00
UnrealGameSync
UGS: Fix compilation errors when DeploymentSettingsInternal.cs is not present.
2019-02-19 16:29:12 -05:00
UnrealHeaderTool
Refactored structs to reduce executable space from UHT-generated code tables.
2019-01-24 15:50:36 -05:00
UnrealHitchParser
Updated CheckCopyrightNotices script to detect more missing files.
2018-12-18 14:42:56 -05:00
UnrealLightmass
Fix merge conflict
2019-01-31 12:42:57 -05:00
UnrealMultiUserServer
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealPak
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
UnrealSwarm
Fix merge conflict
2019-01-31 12:42:57 -05:00
UnrealVersionSelector
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
UnrealVS
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealWatchdog
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Windows/BootstrapPackagedGame
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00