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/AutomationTool
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
..
AllDesktop
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
Android
Added support for using UE_SDK_ROOT (carefullyredist) in build scripts.
2019-01-30 12:33:09 -05:00
AutomationUtils
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
BuildGraph
Fix comment.
2019-01-21 11:20:39 -05:00
Gauntlet
Made SaveRoleArtifacts virtual so it can be overridden
2019-02-05 18:29:50 -05:00
HTML5
HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade
2019-02-19 15:06:08 -05:00
IOS
Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680
2019-01-24 20:39:08 -05:00
Linux
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
Localization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
Lumin
Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
2019-01-28 16:32:53 -05:00
Mac
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
OneSkyLocalization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
Properties
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
Scripts
- Proper fix to merge conflicts
2019-02-19 18:11:13 -05:00
TVOS
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
Win
Prevented server from compressing pak files.
2019-02-19 14:30:16 -05:00
XLocLocalization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
app.config
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
app.manifest
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
AutomationTool_Mono.sln
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2018-06-07 22:39:07 -04:00
AutomationTool.csproj
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
Program.cs
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00