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/AutomationTool/Scripts
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
..
Properties
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
AnalyzeThirdPartyLibs.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ArchiveCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
AutomationScripts.Automation.csproj
UAT: Add a build command to parse the output from MSVC's /d1reportTime argument, and convert it into a trace that can be visualized in Chrome's chrome://tracing tab.
2019-02-05 18:49:07 -05:00
BlameKeyword.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildCommonTools.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildCookRun.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildDerivedDataCache.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildForUGS.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildPhysX.Automation.cs
PhysX: change v13 Linux toolchain to v12 one (for real).
2019-02-16 06:06:55 -05:00
BuildPluginCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BuildProjectCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-25 23:58:19 -05:00
BuildThirdPartyLibs.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckBalancedMacros.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckCsprojDotNetVersion.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckForHacks.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckRestrictedFolders.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckTargetExists.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CheckXcodeVersion.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CleanAutomationReports.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CleanFormalBuilds.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CodeSurgery.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CookCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CopyBuildToStagingDirectory.Automation.cs
- Proper fix to merge conflicts
2019-02-16 07:13:44 -05:00
CopySharedCookedBuild.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CopyUAT.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CopyUsingDistillFileSet.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CryptoKeys.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
DeployCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ExtractPaks.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
FixupRedirects.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
GenerateDSYM.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
GetFileCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
InstalledBuild.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
IPhonePackager.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
LauncherLocalization.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ListMobileDevices.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ListThirdPartySoftware.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Localisation.Automation.cs
Allow Localization Automation to be be submitted to Perforce
2019-01-31 11:36:22 -05:00
MegaXGE.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
PackageCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ParseMsvcTimingInfo.cs
Fix times for MSVC timing info being out by a factor of 1000.
2019-02-16 01:12:51 -05:00
RebasePublicIncludePaths.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RebuildHLODCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RebuildLightMapsCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RecordPerformance.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-29 17:41:46 -05:00
ReplaceAssetsUsingManifest.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ResavePackagesCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ResavePluginDescriptors.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ResaveProjectDescriptors.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RunP4Reconcile.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
RunProjectCommand.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SharedCookedBuild.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
StashTarget.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SubmitUtililzationReportToEC.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SyncDDC.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
SyncDepotPath.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Tests.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
TestSnippet.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UE4BuildUtils.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
UpdateLocalVersion.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
XGE_UBT_Profile.xml
…
ZipUtils.Automation.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00