Mike Fricker 3c416f476d Merging //UE4/Dev-Main to Dev-VREditor (//UE4/Dev-VREditor) (From Main CL 2937853) ...

[CL 2937913 by Mike Fricker in Dev-VREditor branch]

2016-04-08 09:12:14 -04:00

..

AllDesktop

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Android

Merging //UE4/Release-4.11 to //UE4/Main (up to CL#2835147)

2016-01-22 08:13:18 -05:00

AutomationUtils

Merged Main to VREditor (from CL 2932876)

2016-04-05 11:25:00 -04:00

BuildGraph

Merging //UE4/Dev-Main to Dev-VREditor (//UE4/Dev-VREditor) (From Main CL 2937853)

2016-04-08 09:12:14 -04:00

GUBP

Merged Main to VREditor (from CL 2932876)

2016-04-05 11:25:00 -04:00

HTML5

Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167

2016-01-07 11:21:22 -05:00

IOS

Merged Main to VREditor (from CL 2932876)

2016-04-05 11:25:00 -04:00

Linux

Copying //UE4/Dev-Build to //UE4/Main

2016-02-03 15:40:40 -05:00

Localization

Copying //UE4/Orion-Staging to //UE4/Main (Origin: //Orion/Dev-General @2826496)

2016-01-14 08:11:47 -05:00

Mac

Merging //UE4/Release-4.11 to //UE4/Main (up to CL#2852902)

2016-02-05 11:54:00 -05:00

OneSkyLocalization

Copying //UE4/Orion-Staging to //UE4/Main (Origin: //Orion/Dev-General @2826496)

2016-01-14 08:11:47 -05:00

Properties

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Scripts

Merging //UE4/Dev-Main to Dev-VREditor (//UE4/Dev-VREditor) (From Main CL 2937853)

2016-04-08 09:12:14 -04:00

TVOS

Merged Main to VREditor (from CL 2932876)

2016-04-05 11:25:00 -04:00

Win

Branch snapshot for CL 2936774

2016-04-07 15:45:45 -04:00

app.config

Summary: running UAT from VS is simpler and faster.

2015-07-09 10:15:37 -04:00

AutomationTool_Mono.sln

Copying //UE4/Dev-Platform to //UE4/Main

2015-12-10 16:56:55 -05:00

AutomationTool.csproj

Fix for 'launch on' not working due to stale code from other projects preventing UAT from compiling. Editor passes -ScriptsForProject= argument to UAT to limit the scripts which are compiled and loaded, but a stale AutomationTool.csproj.References file can bring in references to other projects. Disable the include using a property passed on the command line from RunUAT.bat.

2015-11-17 11:55:31 -05:00

Program.cs

Copying //UE4/Dev-Build to //UE4/Main

2016-01-11 10:12:46 -05:00

SharedUtils.cs

Copying //UE4/Dev-Core to //UE4/Main

2016-01-27 12:09:53 -05:00