Files
UnrealEngineUWP/Engine/Source/Programs/AutomationTool/AutomationUtils/LocalP4Environment.cs

376 lines
14 KiB
C#
Raw Normal View History

// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnrealBuildTool;
namespace AutomationTool
{
/// <summary>
/// Local P4 environment settings
/// </summary>
class LocalP4Environment : P4Environment
{
internal LocalP4Environment(P4Connection Connection, CommandEnvironment CmdEnv)
: base(Connection, CmdEnv)
{
}
/// <summary>
/// Initializes the environment. Tries to autodetect all source control settings.
/// </summary>
/// <param name="CompilationEnv">Compilation environment</param>
protected override void InitEnvironment(P4Connection Connection, CommandEnvironment CmdEnv)
{
var HostName = Environment.MachineName.ToLower();
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140) ========================== MAJOR FEATURES + CHANGES ========================== Change 2959679 on 2016/04/28 by Ben.Marsh UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag. Change 2959695 on 2016/04/28 by Ben.Marsh UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter". Change 2960798 on 2016/04/29 by Ben.Marsh Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT. Change 2960928 on 2016/04/29 by Ben.Marsh UGS: Change filter for buildmachine changes to only include rebuilt lightmaps. Change 2963214 on 2016/05/02 by Ben.Marsh BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running. Change 2964454 on 2016/05/03 by Ben.Marsh Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing. Change 2964533 on 2016/05/03 by Ben.Marsh BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS. Change 2964852 on 2016/05/03 by Ben.Marsh BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so. Change 2966856 on 2016/05/04 by Ben.Marsh EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc... Change 2966867 on 2016/05/04 by Ben.Marsh EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval. Change 2967504 on 2016/05/05 by Ben.Marsh UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription. Change 2967778 on 2016/05/05 by Ben.Marsh UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG. Change 2967815 on 2016/05/05 by Ben.Marsh EC: Copy the initial resource pool setting from the stream settings into an EC property Change 2967873 on 2016/05/05 by Ben.Marsh EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet. Change 2969294 on 2016/05/06 by Ben.Marsh EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments. Change 2969371 on 2016/05/06 by Ben.Marsh EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams. Change 2970623 on 2016/05/09 by Ben.Marsh UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered. Change 2970627 on 2016/05/09 by Ben.Marsh UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants. Change 2972140 on 2016/05/10 by Ben.Marsh Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger. #lockdown Nick.Penwarden [CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
var P4PortEnv = DetectP4Port();
var UserName = CommandUtils.GetEnvVar(EnvVarNames.User);
if (String.IsNullOrEmpty(UserName))
{
UserName = DetectUserName(Connection);
}
var CommandLineClient = CommandUtils.GetEnvVar(EnvVarNames.Client);
P4ClientInfo ThisClient = null;
if (String.IsNullOrEmpty(CommandLineClient) == false)
{
ThisClient = Connection.GetClientInfo(CommandLineClient);
if (ThisClient == null)
{
throw new AutomationException("Unable to find client {0}", CommandLineClient);
}
if (String.Compare(ThisClient.Owner, UserName, true) != 0)
{
throw new AutomationException("Client specified with {0}={1} has a different owner then the detected user name (has: {2}, expected: {3})",
EnvVarNames.Client, CommandLineClient, ThisClient.Owner, UserName);
}
}
else
{
ThisClient = DetectClient(Connection, UserName, HostName, CmdEnv.UATExe);
}
Log.TraceInformation("Using user {0} clientspec {1} {2}", UserName, ThisClient.Name, ThisClient.RootPath);
Environment.SetEnvironmentVariable("P4CLIENT", ThisClient.Name);
string BuildRootPath;
string ClientRootPath;
DetectRootPaths(Connection, CmdEnv.LocalRoot, ThisClient, out BuildRootPath, out ClientRootPath);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.P4Port, P4PortEnv);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.User, UserName);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.Client, ThisClient.Name);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.BuildRootP4, BuildRootPath);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.ClientRoot, ClientRootPath);
var CLString = CommandUtils.GetEnvVar(EnvVarNames.Changelist, null);
if (String.IsNullOrEmpty(CLString) && CommandUtils.P4CLRequired)
{
CLString = DetectCurrentCL(Connection, ClientRootPath);
}
if (!String.IsNullOrEmpty(CLString))
{
CommandUtils.ConditionallySetEnvVar(EnvVarNames.Changelist, CLString);
}
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3064255) #lockdown Nick.Penwarden Change 3063869 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Added a cvar (t.FPSChart.OpenFolderOnDump) to control whether or not FPS charts automatically open the profiling folder when stopfpschart is executed, which can be useful to avoid a bunch of open windows while doing automated testing #rb marcus.wassmer #tests Tested startfpschart + stopfpschart with t.FPSChart.OpenFolderOnDump set to 1 and 0 #codereview david.nikdel Change 3063829 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Core: Added an optional size to MallocLeak Stop and made the default filter size 128 KB for both MallocLeak Dump and MallocLeak Stop if no size was specified #rb marcus.wassmer #tests Tested using MallocLeak Stop and MallocLeak Dump Change 3063825 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Exposed GPU revision ID as GRHIDeviceRevision and added it to the FPS chart analytics (gathered on D3D11 and D3D12 only) #rb marcus.wassmer #tests Tested on my desktop and compared to dxdiag output Change 3063702 on 2016/07/25 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Collect garbage when scrubbing in a replay. Scrubbing generates a lot of garbage, and can lead to running out of memory. Can be disabled with the cvar demo.LoadCheckpointGarbageCollect. #jira OR-25964 #tests bug repro #rb john.pollard Change 3063426 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Borderless window support improvements: - the cursor changes to resize when hovering over the window edge - added a way for widgets to register a delegate that's called when window actions occur (maximize, restore, etc.) - used he window action notification for WindowTitleBarArea to improve how toggling fullscreen on double click is handled #rb Jeff.Campeau #tests Tested in editor build on PC Change 3063358 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3063307 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3063345 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063353 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging CL 3037547 and CL 3037552 from //UE4/Dev-Build to support BuildPatchTool analytics. #rb none #tests none #ROBOMERGE-SOURCE: CL 3063156 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063198 on 2016/07/25 by Matt.Kuhlenschmidt@matt.kuhlenschmidt_orion_dev Temp fix for broken post process volumes #rb none #tests none Change 3063166 on 2016/07/25 by Daniel.Lamb@daniel.lamb_T3905_6612 Added check to Redirect collector resolve string asset references. #rb none #test cook paragon Change 3063057 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Use round corners for windows with no system title bar and border only in windowed mode. #rb Peter.Sauerbrei #tests Tested in editor build on PC Change 3063015 on 2016/07/25 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim notifies not working when playing animation on blueprint-driven skeletal meshes We now inject a new animation position into the animation system, rather than trying to 'fake' events outside of the system. This allows for much more robust event triggering when playing back through sequencer. Previously, anim notifies for trail particles would be reset every frame due to TriggerAnimNotifies being called by the animation system, and sequencer. We now defer this responsibility to the animation system entirely during playback. #tests Tested sequencer driven animation with animation assets and (compatible) animation blueprints. Tested some non-sequencer animation. #rb Benn.Gallagher Change 3062774 on 2016/07/24 by Ben.Marsh@Ben.Marsh_T3245_Orion BuildGraph: Fix <Cook> tasks failing when multiple platforms are specified, due to not scanning the output directories separately. #rb none #tests preflight Change 3062761 on 2016/07/24 by Andrew.Grant@andrew.grant.T6730.orion.floating Non-unity fix #rb none #tests compiled Change 3062324 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Skipped a file #rb none #test none Change 3062315 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow r.SSR.MaxRoughness in shipping builds. Art has been tweaking with this value, but it's not being honored in shipping. #rb none #tests adjusted settings in agora_p Change 3062306 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral HLOD distance scalability option (r.HLOD.DistanceScale) Higher values make HLODS transition further away. #rb Michael.Noland #tests Tested in agora_p Change 3061861 on 2016/07/22 by Lina.Halper@Lina.Halper_Orion Fix Compression - Reduce functions to be editoronly #rb: Martin.Wilson #tests: PIE/compile editor build/noneditor Change 3061714 on 2016/07/22 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim trails not playing in full, sequencer-driven animation. There were 2 issues here. Firstly, we were force-handling events and anim notifies in non-preview animation which caused undefined behaviour when the animation was also updated on tick. Secondly, On the very first frame of a game, sequencer can sometimes use the PreviewSetMatineeAnimPositionInner method because the actor it is referencing has not begun play yet. Unfortunately this function left the animation in a state where the 'real' animation update function wouldn't trigger any anim notifies properly. #tests Tested animation with and without anim trails to verify they work in editor, PIE and standalone game with and without sequencer open. Rendered out the announce trailer before and after my changes to verify there was no change in behaviour. #jira OR-25967 #review-3061494 @Max.Chen #rb Benn.Gallagher Change 3061393 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: sam.zamani compile errors #rb none #tests compile #ROBOMERGE-SOURCE: CL 3061392 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3061384 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: andrew.grant Fixed build breakage #rb none #tests compiled PS4 client #ROBOMERGE-SOURCE: CL 3061383 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060894 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion, #OnlineSubsystem, #OnlineGameplayFramework - Game catalog supports Price Engine sales on real-money offers #rb Sam.Zamani #tests Real-money offers that are on sale show the correct sale price / discount display #jira OR-21659 #ROBOMERGE-SOURCE: CL 3060891 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060272 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion Fix compile issue of non editor build #rb: none #tests: compile Change 3060161 on 2016/07/21 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Duplicate 3046845 CVAR threading crash fix. #rb none #tests compiled, ran ps4 Change 3060012 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion - Back out changelist 3056611 - Fix additive issue and built the new animation DDC #rb: Martin.Wilson #tests: Jump_Recovery_Additive, PIE Change 3060009 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream When receiving NotLeader party join rejection, include the new leader id and re-attempt the join to the new leader #jira OR-25648 #rb bart.bressler #tests frontend parties with promotions, coop matchmaking Change 3059989 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Fixes for applocal redist #rb none #test built locally Change 3059832 on 2016/07/21 by Martin.Wilson@MartinWilsonOrionStream Fix graph linked external object saving error on re-compressed animations (dup from dev-framework CL ) #jira UE-33567 #rb Thomas.Sarkanen #tests In editor testing that animations can be recompressed and saved Change 3059803 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Switching Orion, UnrealCEFSubProcess, and CrashReporterClient to build with VS2015 Added AppLocalPrerequisitesDirectory editor setting that is passed in -applocaldir during staging WinPlatformAutomation now stages applocaldir to project and engine binaries Updated OrionBuild.xml to specify -applocaldir #codereview Jeff.Campeau, Ben.Marsh #rb none #tests build client locally and verified DLLs are local to executables Change 3059707 on 2016/07/21 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix case where DefaultGameplayTags.ini fails to update if not checked out from source control #rb none #tests add tags without source control Change 3059679 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream Fix nonunity compile error due to OnlinePresenceInterface.h requiring enum defined in OnlineSubsystemTypes.h #rb paul.moore #tests compile with OrionFriendItem.cpp modified Change 3059518 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating AppLcoalDependencies required by VS2015 Change 3059477 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3059419 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3059476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3059455 on 2016/07/21 by Graeme.Thornton@GThornton_Orion_DevGeneral Linux build fix (bad case on #include filename) #rb robert.manuszewski #tests compiled Paragon on a linux machine Change 3059258 on 2016/07/21 by Simon.Tovey@Simon.Tovey_OrionDev Implementing 3050352 in Dev-General. #rb none #tests Editor #codereview Marcus.Wassmer Change 3058989 on 2016/07/21 by Michael.Noland@mnoland_T2801_OrionStream Audio: Disabling the audio thread to prevent a crash in async line trace code (it is already disabled in UE4 main) #rb none #codereview andrew.grant, ori.cohen Change 3058773 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Remove QoS* from junk manifest #review-3058772 @Rob.Cannaday #rb none #tests QoS module doesn't get nuked every build #ROBOMERGE-SOURCE: CL 3058771 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058717 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added submitted CL to success email for rebuild lighting commandlet. Removed nosimplygon from resave lighting commandlet commandline. #rb Daniel.Wright #test rebuildlighting paragon devgeneral. Change 3058565 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Fix debug/non-development builds #rb Rob.Cannaday #tests it builds (and doesn't crash on login) on Debug Editor -debug -game! #ROBOMERGE-SOURCE: CL 3058563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058082 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added error to the lighting build whent it fails to build. #test Rebuild lighting commandlet #rb Daniel.Wright Change 3057945 on 2016/07/20 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for NAN issue introduced in 3032847 #rb Jeff.Farris #tests none Change 3057840 on 2016/07/20 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix developer tags not properly adding to perforce when creating a new file #rb none #tests developer tags Change 3057553 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3057330 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3057549 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3057313 on 2016/07/20 by bruce.nesbit@BNesbit_Orion_Stream_1 Fixed shadowvariable in FAnalyticsEventEntry #rb none #tests compiled #codereview Wes.Hunt Change 3056802 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Fix issue where replicated map-placed actors with ability system components would cache an incorrect Role value. This could cause predicted gameplay effects in the fast TArray to have MarkItemDirty called on them, which in turn increments the item's ReplicationID, potentially causing a conflict with the server's ReplicationID. Since the Role may not be correct during OnRegister for these components, also cache it BeginPlay. #jira OR-25234 #rb david.ratti #tests golden path, bug repro #ROBOMERGE-SOURCE: CL 3056801 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3056797 on 2016/07/19 by Wes.Hunt@WHUNT-ORION-STREAM OrionAnalytics updates. * Added IAnalyticsProviderET::SetDefaultEventAttributes to use to set the GameSessionID on all Orion Analytics events. * Removed OrionAnalyticsProvider as it was no longer necessary. * Updated all Orion code to use IAnalyticsProviderET directly in the code to be able to access all the new APIs. #rb sam.zamani, jason.bestimt #tests run dedicated server with 10 bot clients, observe analytics events sending correctly. Ran PIE. #jira UE-30980 Change 3056611 on 2016/07/19 by Lina.Halper@Lina.Halper_Orion Fix for additive broken with remove linear key - DDC key has been changed, so it will require to build DDC from this #rb: Martin.Wilson #tests: Jump_Recovery_Additive in editor, and PIE Change 3056226 on 2016/07/19 by Lukasz.Furman@Lukasz.Furman_T7320_OrionStream extended gameplay debugger's ability category to show locally owned gameplay tags #orion #rb none #tests PIE Change 3056204 on 2016/07/19 by Jeff.Campeau@jeff.campeau_3753_Orion Fix offset rendering of maximized borderless game window on Windows. #review-3055205 @michael.trepka #rb Michael.Trepka #tests Tested in editor build on PC (editor window normal and maximized, game window borderless normal and maximized, game window bordered normal and maximized). Change 3056028 on 2016/07/19 by Rob.Cannaday@rob.cannaday_orion-stream Add moved modules to JunkManifest.txt Change 3055650 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - ACTUAL Merge 29.2 @ CL 3055553 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3055647 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3055620 on 2016/07/19 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Attempts to fix rare server crashes (OR-24947, OR-24952). - Rearranging to avoid AddDefaulted(), that might be triggering a compiler bug (conjecture). #rb Steve.Robb #codereview Steve.Robb #tests Compiled Windows client and Linux server, played a match. Change 3054587 on 2016/07/18 by Andrew.Grant@andrew.grant.T6730.orion.floating Merging from //UE4/Main @ 3043787 through //UE4/Orion-Staging #rb none #tests Smoked by engine and dev QA Change 3054491 on 2016/07/18 by Frank.Gigliotti@Frank.Gig_T4217_Orion_Stream Removed warning when client miss-predicts ability activation. * It is valid for the client to miss-predict. Warning was only added to track down a bug. #CodeReview David.Ratti #RB None #Tests None Change 3053850 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Missed checkins on ability system engine work: -Register debug delegate on module startup for easier debugging -Fallback to actor location if no hit impact is specified in default engine GC notify class #rb none #tests ability system sample project Change 3053825 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Fix issue where config file not actually flushed at right time when adding new tags Fix issue where orion projecetile tags that are auto generated was generating tags for non gameplay tag properties #rb DanY #codereview Dan.Youhon #tests pie Change 3053438 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General -Remove developer tags from master tag list before saving to ini file -inline some stuff (wip for gc tag translator system) #rb none #test adding tags Change 3053414 on 2016/07/18 by Robert.Manuszewski@Robert_Manuszewski_NCL_Orion Fixing rare crash when async loading objects caused by linker being detached too early (before other package's import has been fully processed) #jira OR-24955 #jira OR-25183 #rb Graeme.Thornton #tests Win64 cooked client golden path (solo vs AI) Change 3052009 on 2016/07/15 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Overhaul of behavior of headless applications (server, client) (OR-23529). - Removed FApp::ShouldUseNullRHI(). Rationale: FApp::CanEverRender() answers a higher level question and the code shouldn't predicate on the type of RHI used. - Multiple code paths updated to prevent code execution on headless clients (some of this is optimization, some was causing crashes). - Most of these changes originated from a shelved CL by BradA. #rb Michael.Noland #codereview Michael.Noland, Brad.Angelcyk, Andrew.Grant, Chris.Wood, Matt.Schembari #tests Cooked Windows client and server, Linux client and server. Ran Windows client and server, played a match, ran Linux bot (headless client, requires local changes not in this CL), ran the Windows editor (tried PIE). Change 3051926 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Reinstate color grading changes. Fix broken config file. #rb none #tests Agora_p color grading and warning check Change 3051759 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't record predicted elements of fast TArrays into client replays. Fixes issue where the client was incrementing the ReplicationID of predicted elements, potentially conflicting with the IDs of elements received by the server. #jira OR-25234, OR-25413, OR-25403 #tests golden path, bug repo using 'net pktlag', replays #rb john.pollard, david.ratti #ROBOMERGE-SOURCE: CL 3051758 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051702 on 2016/07/15 by Daniel.Lamb@daniel.lamb_T3905_6612 Added jordan walker to rebuild lighting emails. Removed peter.sauerbrei. #rb Peter.Sauerbrei #test none Change 3051661 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging support for precompiled binaries in CIS from Release-29. #rb none #tests none #ROBOMERGE-SOURCE: CL 3051660 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051466 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow seamless upgrade from FVector -> FVector4 for UProperties. #rb Robert.Manuszewski #tests Color grading property changes. Change 3050680 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Mcp, #Orion - Fix initalization values of CatalogServiceMcp #rb none #tests Real money offers show in the store again #ROBOMERGE-SOURCE: CL 3050563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050520 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - MERGING DUI @ CL 3047139 #RB:none #Tests:none [CodeReviewed]: kerrington.smith, dan.hertzka, matt.schembari, benjamin.crocker, jaymee.stanford, alex.conner #ROBOMERGE-SOURCE: CL 3050519 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050465 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't check IsClientOnly() to detemine whether a player controller is local or not. For client replay recording, the replay spectator controller should not return true from IsLocallyControlled(). This change fixes that case in client builds. Fixes issue where the SignificanceManager was using the replay spectator to influence significance values, causing them to be incorrect for the game player controller. #jira OR-25258 #tests bug repro, golden path, replays #rb john.pollard [CodeReviewed] zak.middleton, josh.markiewicz #ROBOMERGE-SOURCE: CL 3050462 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050326 on 2016/07/14 by Dan.Youhon@Dan.Youhon.Paragon Set CameraLensEffects position before activation so that initial significance values are correct, specifically to fix quick camera lens effects being culled out due to incorrect significance #OR-18321 - Moves location determination code from AEmitterCameraLensEffectBase::UpdateLocation into a separate static GetAttachedEmitterTransform function, which is now called both from UpdateLocation and in APlayerCameraManager::AddCameraLensEffect to determine SpawnTransform for the LensEffect SpawnActor call - Unshelved from Jeff.Farris. Thanks Jeff! #rb Dan.Youhon #tests MultiPIE #codereview Jeff.Farris Change 3049749 on 2016/07/14 by Daniel.Lamb@daniel.lamb_T3905_6612 Added skipskin verify to rebuild lighting commandlet. #rb None #test Rebuild lighting commandlet Change 3049728 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: buildmachine Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting #ROBOMERGE-SOURCE: CL 3049727 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049721 on 2016/07/14 by buildmachine@buildmachine_Z4560_OrionDevGeneral Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting Change 3049325 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Back out changelist 3049037 due to incompatibility with current assets #rb none #tests Cooked content and verified warnings & errors are gone. #codereview Marcus.Wasmer, Brian.Karis, HaarmPieter.Duiker Change 3049319 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating More work on content filtering (still disabled) #rb none #tests cooked content and verified filtered content is not found. Change 3049298 on 2016/07/13 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2/29 @ CL 3049113 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3049296 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049269 on 2016/07/13 by Mieszko.Zielinski@mieszko.zielinski_T4675_Orion Constified FObjectFinder::Succeeded because why not #UE4 #rb none #test golden path Change 3049104 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Created delegate for object name resolution and moved existing package localization code to use it. Orion code to filter out unreleased heroes and other data, but correnty disabled due to a cooking bug. #rb none #tests ran editor, ran cooker, verified object resolution is equivalent to before. Change 3049037 on 2016/07/13 by HaarmPieter.Duiker@HPD-Dev-General Adding shadows, midtones and highlights color correction controls #rb brian.karis, marcus.wassmer #tests "postprocess color correction" Change 3048457 on 2016/07/13 by Cody.Haskell@OrionStream #UE4 - Adding a delegate that fires off when LastUserInteractionTime is updated #codereview Matt.Kuhlenschmidt #rb none #tests PIE Change 3048420 on 2016/07/13 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Fix double #undef LOCTEXT_NAMESPACE in editor case. #rb none #codereview Nick.Darnell, Andrew.Grant #tests Compiled Linux editor (for running -server). Change 3047891 on 2016/07/13 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Rollback //Orion/Dev-General/Engine/Source/Runtime/Core/Private/Windows/WindowsWindow.cpp to revision 12 #rb none #tests Tested in editor on PC Change 3047216 on 2016/07/12 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Changes to Linux application specific to Linux client. #rb none #codereview Brad.Angelcyk #tests Ran Paragon Linux client (headless) locally. Change 3047140 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for PS4 #rb #tests na Change 3047107 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Moved timeguards out of stats.h #rb none #tests compiled editor & shipping client Change 3046996 on 2016/07/12 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Don't check bTearOff when deciding whether to swap roles for client replay recording and improve the comment. Fixes an assert that could occur if a torn-off actor happened to get recorded into a checkpoint of a client replay. #tests golden path #rb john.pollard Change 3046975 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Support for making the game window borderless (no system border or title bar). Disabled by default. Enabling requires adding bUseBorderlessWindow=True to [/Script/EngineSettings.GeneralProjectSettings] in DefaultGame.ini. The game using this is responsible for adding WindowTitleBarArea widget to its UI, as well as window minimize/maximize/close buttons. #codereview Dan.Hertzka #rb Jeff.Campeau #tests Tested in editor build on PC Change 3046812 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev New UI for selecting fullscreen mode in Paragon video settings #rb Dan.Hertzka #tests Tested in editor build on PC Change 3046803 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Added an option to WindowTitleBarArea widget to make it toggle fullscreen mode instead of maximizing the window. #rb Dan.Hertzka #tests Tested in editor build on PC Change 3045374 on 2016/07/11 by John.Pollard@John.Pollard_T2802_Orion_DevGeneral Fix assert in channel cleanup code that could occur if the connection was cleaned up, and there were KeepProcessingActorChannelBunchesMap in-flight still #rb RyanG #tests Replays Change 3044696 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Added additional checks to ResavePackagesCommandlet so people don't miss the required allowcommandletrendering flag when using buildlighting option. #test rebuild lighting using resave packages paragon #rb None Change 3044690 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Changed MBWritten cooker stats to report mb instead of bytes... #rb Wes.Hunt. #test cook paragon. Change 3044439 on 2016/07/11 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3043960 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3044428 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) [CL 3070724 by Andrew Grant in Main branch]
2016-07-29 17:10:25 -04:00
var CodeCLString = CommandUtils.GetEnvVar(EnvVarNames.CodeChangelist, null);
if (String.IsNullOrEmpty(CodeCLString) && CommandUtils.P4CLRequired)
{
CodeCLString = DetectCurrentCodeCL(Connection, ClientRootPath);
}
if (!String.IsNullOrEmpty(CodeCLString))
{
CommandUtils.ConditionallySetEnvVar(EnvVarNames.CodeChangelist, CodeCLString);
}
CommandUtils.ConditionallySetEnvVar("P4USER", UserName);
CommandUtils.ConditionallySetEnvVar("P4CLIENT", ThisClient.Name);
var P4Password = Environment.GetEnvironmentVariable(EnvVarNames.P4Password);
if (!String.IsNullOrEmpty(P4Password))
{
CommandUtils.ConditionallySetEnvVar("P4PASSWD", P4Password);
}
SetBuildRootEscaped();
base.InitEnvironment(Connection, CmdEnv);
}
/// <summary>
/// Sets the escaped build root environment variable. If the build root is not set, UAT's location UE4 root will be used.
/// </summary>
private void SetBuildRootEscaped()
{
var BuildRoot = CommandUtils.GetEnvVar(EnvVarNames.BuildRootP4);
if (String.IsNullOrEmpty(BuildRoot))
{
throw new AutomationException("Build root is empty");
}
BuildRoot = CommandUtils.EscapePath(BuildRoot);
CommandUtils.ConditionallySetEnvVar(EnvVarNames.BuildRootEscaped, BuildRoot);
}
/// <summary>
/// Detects the current changelist the workspace is synced to.
/// </summary>
/// <param name="ClientRootPath">Workspace path.</param>
/// <returns>Changelist number as a string.</returns>
private static string DetectCurrentCL(P4Connection Connection, string ClientRootPath)
{
CommandUtils.LogVerbose("uebp_CL not set, detecting 'have' CL...");
// Retrieve the current changelist
var P4Result = Connection.P4("changes -m 1 " + CommandUtils.CombinePaths(PathSeparator.Depot, ClientRootPath, "/...#have"), AllowSpew: false);
var CLTokens = P4Result.Output.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
var CLString = CLTokens[1];
var CL = Int32.Parse(CLString);
if (CLString != CL.ToString())
{
throw new AutomationException("Failed to retrieve current changelist.");
}
return CLString;
}
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3064255) #lockdown Nick.Penwarden Change 3063869 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Added a cvar (t.FPSChart.OpenFolderOnDump) to control whether or not FPS charts automatically open the profiling folder when stopfpschart is executed, which can be useful to avoid a bunch of open windows while doing automated testing #rb marcus.wassmer #tests Tested startfpschart + stopfpschart with t.FPSChart.OpenFolderOnDump set to 1 and 0 #codereview david.nikdel Change 3063829 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Core: Added an optional size to MallocLeak Stop and made the default filter size 128 KB for both MallocLeak Dump and MallocLeak Stop if no size was specified #rb marcus.wassmer #tests Tested using MallocLeak Stop and MallocLeak Dump Change 3063825 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Exposed GPU revision ID as GRHIDeviceRevision and added it to the FPS chart analytics (gathered on D3D11 and D3D12 only) #rb marcus.wassmer #tests Tested on my desktop and compared to dxdiag output Change 3063702 on 2016/07/25 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Collect garbage when scrubbing in a replay. Scrubbing generates a lot of garbage, and can lead to running out of memory. Can be disabled with the cvar demo.LoadCheckpointGarbageCollect. #jira OR-25964 #tests bug repro #rb john.pollard Change 3063426 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Borderless window support improvements: - the cursor changes to resize when hovering over the window edge - added a way for widgets to register a delegate that's called when window actions occur (maximize, restore, etc.) - used he window action notification for WindowTitleBarArea to improve how toggling fullscreen on double click is handled #rb Jeff.Campeau #tests Tested in editor build on PC Change 3063358 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3063307 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3063345 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063353 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging CL 3037547 and CL 3037552 from //UE4/Dev-Build to support BuildPatchTool analytics. #rb none #tests none #ROBOMERGE-SOURCE: CL 3063156 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063198 on 2016/07/25 by Matt.Kuhlenschmidt@matt.kuhlenschmidt_orion_dev Temp fix for broken post process volumes #rb none #tests none Change 3063166 on 2016/07/25 by Daniel.Lamb@daniel.lamb_T3905_6612 Added check to Redirect collector resolve string asset references. #rb none #test cook paragon Change 3063057 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Use round corners for windows with no system title bar and border only in windowed mode. #rb Peter.Sauerbrei #tests Tested in editor build on PC Change 3063015 on 2016/07/25 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim notifies not working when playing animation on blueprint-driven skeletal meshes We now inject a new animation position into the animation system, rather than trying to 'fake' events outside of the system. This allows for much more robust event triggering when playing back through sequencer. Previously, anim notifies for trail particles would be reset every frame due to TriggerAnimNotifies being called by the animation system, and sequencer. We now defer this responsibility to the animation system entirely during playback. #tests Tested sequencer driven animation with animation assets and (compatible) animation blueprints. Tested some non-sequencer animation. #rb Benn.Gallagher Change 3062774 on 2016/07/24 by Ben.Marsh@Ben.Marsh_T3245_Orion BuildGraph: Fix <Cook> tasks failing when multiple platforms are specified, due to not scanning the output directories separately. #rb none #tests preflight Change 3062761 on 2016/07/24 by Andrew.Grant@andrew.grant.T6730.orion.floating Non-unity fix #rb none #tests compiled Change 3062324 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Skipped a file #rb none #test none Change 3062315 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow r.SSR.MaxRoughness in shipping builds. Art has been tweaking with this value, but it's not being honored in shipping. #rb none #tests adjusted settings in agora_p Change 3062306 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral HLOD distance scalability option (r.HLOD.DistanceScale) Higher values make HLODS transition further away. #rb Michael.Noland #tests Tested in agora_p Change 3061861 on 2016/07/22 by Lina.Halper@Lina.Halper_Orion Fix Compression - Reduce functions to be editoronly #rb: Martin.Wilson #tests: PIE/compile editor build/noneditor Change 3061714 on 2016/07/22 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim trails not playing in full, sequencer-driven animation. There were 2 issues here. Firstly, we were force-handling events and anim notifies in non-preview animation which caused undefined behaviour when the animation was also updated on tick. Secondly, On the very first frame of a game, sequencer can sometimes use the PreviewSetMatineeAnimPositionInner method because the actor it is referencing has not begun play yet. Unfortunately this function left the animation in a state where the 'real' animation update function wouldn't trigger any anim notifies properly. #tests Tested animation with and without anim trails to verify they work in editor, PIE and standalone game with and without sequencer open. Rendered out the announce trailer before and after my changes to verify there was no change in behaviour. #jira OR-25967 #review-3061494 @Max.Chen #rb Benn.Gallagher Change 3061393 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: sam.zamani compile errors #rb none #tests compile #ROBOMERGE-SOURCE: CL 3061392 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3061384 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: andrew.grant Fixed build breakage #rb none #tests compiled PS4 client #ROBOMERGE-SOURCE: CL 3061383 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060894 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion, #OnlineSubsystem, #OnlineGameplayFramework - Game catalog supports Price Engine sales on real-money offers #rb Sam.Zamani #tests Real-money offers that are on sale show the correct sale price / discount display #jira OR-21659 #ROBOMERGE-SOURCE: CL 3060891 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060272 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion Fix compile issue of non editor build #rb: none #tests: compile Change 3060161 on 2016/07/21 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Duplicate 3046845 CVAR threading crash fix. #rb none #tests compiled, ran ps4 Change 3060012 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion - Back out changelist 3056611 - Fix additive issue and built the new animation DDC #rb: Martin.Wilson #tests: Jump_Recovery_Additive, PIE Change 3060009 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream When receiving NotLeader party join rejection, include the new leader id and re-attempt the join to the new leader #jira OR-25648 #rb bart.bressler #tests frontend parties with promotions, coop matchmaking Change 3059989 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Fixes for applocal redist #rb none #test built locally Change 3059832 on 2016/07/21 by Martin.Wilson@MartinWilsonOrionStream Fix graph linked external object saving error on re-compressed animations (dup from dev-framework CL ) #jira UE-33567 #rb Thomas.Sarkanen #tests In editor testing that animations can be recompressed and saved Change 3059803 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Switching Orion, UnrealCEFSubProcess, and CrashReporterClient to build with VS2015 Added AppLocalPrerequisitesDirectory editor setting that is passed in -applocaldir during staging WinPlatformAutomation now stages applocaldir to project and engine binaries Updated OrionBuild.xml to specify -applocaldir #codereview Jeff.Campeau, Ben.Marsh #rb none #tests build client locally and verified DLLs are local to executables Change 3059707 on 2016/07/21 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix case where DefaultGameplayTags.ini fails to update if not checked out from source control #rb none #tests add tags without source control Change 3059679 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream Fix nonunity compile error due to OnlinePresenceInterface.h requiring enum defined in OnlineSubsystemTypes.h #rb paul.moore #tests compile with OrionFriendItem.cpp modified Change 3059518 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating AppLcoalDependencies required by VS2015 Change 3059477 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3059419 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3059476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3059455 on 2016/07/21 by Graeme.Thornton@GThornton_Orion_DevGeneral Linux build fix (bad case on #include filename) #rb robert.manuszewski #tests compiled Paragon on a linux machine Change 3059258 on 2016/07/21 by Simon.Tovey@Simon.Tovey_OrionDev Implementing 3050352 in Dev-General. #rb none #tests Editor #codereview Marcus.Wassmer Change 3058989 on 2016/07/21 by Michael.Noland@mnoland_T2801_OrionStream Audio: Disabling the audio thread to prevent a crash in async line trace code (it is already disabled in UE4 main) #rb none #codereview andrew.grant, ori.cohen Change 3058773 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Remove QoS* from junk manifest #review-3058772 @Rob.Cannaday #rb none #tests QoS module doesn't get nuked every build #ROBOMERGE-SOURCE: CL 3058771 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058717 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added submitted CL to success email for rebuild lighting commandlet. Removed nosimplygon from resave lighting commandlet commandline. #rb Daniel.Wright #test rebuildlighting paragon devgeneral. Change 3058565 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Fix debug/non-development builds #rb Rob.Cannaday #tests it builds (and doesn't crash on login) on Debug Editor -debug -game! #ROBOMERGE-SOURCE: CL 3058563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058082 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added error to the lighting build whent it fails to build. #test Rebuild lighting commandlet #rb Daniel.Wright Change 3057945 on 2016/07/20 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for NAN issue introduced in 3032847 #rb Jeff.Farris #tests none Change 3057840 on 2016/07/20 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix developer tags not properly adding to perforce when creating a new file #rb none #tests developer tags Change 3057553 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3057330 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3057549 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3057313 on 2016/07/20 by bruce.nesbit@BNesbit_Orion_Stream_1 Fixed shadowvariable in FAnalyticsEventEntry #rb none #tests compiled #codereview Wes.Hunt Change 3056802 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Fix issue where replicated map-placed actors with ability system components would cache an incorrect Role value. This could cause predicted gameplay effects in the fast TArray to have MarkItemDirty called on them, which in turn increments the item's ReplicationID, potentially causing a conflict with the server's ReplicationID. Since the Role may not be correct during OnRegister for these components, also cache it BeginPlay. #jira OR-25234 #rb david.ratti #tests golden path, bug repro #ROBOMERGE-SOURCE: CL 3056801 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3056797 on 2016/07/19 by Wes.Hunt@WHUNT-ORION-STREAM OrionAnalytics updates. * Added IAnalyticsProviderET::SetDefaultEventAttributes to use to set the GameSessionID on all Orion Analytics events. * Removed OrionAnalyticsProvider as it was no longer necessary. * Updated all Orion code to use IAnalyticsProviderET directly in the code to be able to access all the new APIs. #rb sam.zamani, jason.bestimt #tests run dedicated server with 10 bot clients, observe analytics events sending correctly. Ran PIE. #jira UE-30980 Change 3056611 on 2016/07/19 by Lina.Halper@Lina.Halper_Orion Fix for additive broken with remove linear key - DDC key has been changed, so it will require to build DDC from this #rb: Martin.Wilson #tests: Jump_Recovery_Additive in editor, and PIE Change 3056226 on 2016/07/19 by Lukasz.Furman@Lukasz.Furman_T7320_OrionStream extended gameplay debugger's ability category to show locally owned gameplay tags #orion #rb none #tests PIE Change 3056204 on 2016/07/19 by Jeff.Campeau@jeff.campeau_3753_Orion Fix offset rendering of maximized borderless game window on Windows. #review-3055205 @michael.trepka #rb Michael.Trepka #tests Tested in editor build on PC (editor window normal and maximized, game window borderless normal and maximized, game window bordered normal and maximized). Change 3056028 on 2016/07/19 by Rob.Cannaday@rob.cannaday_orion-stream Add moved modules to JunkManifest.txt Change 3055650 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - ACTUAL Merge 29.2 @ CL 3055553 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3055647 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3055620 on 2016/07/19 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Attempts to fix rare server crashes (OR-24947, OR-24952). - Rearranging to avoid AddDefaulted(), that might be triggering a compiler bug (conjecture). #rb Steve.Robb #codereview Steve.Robb #tests Compiled Windows client and Linux server, played a match. Change 3054587 on 2016/07/18 by Andrew.Grant@andrew.grant.T6730.orion.floating Merging from //UE4/Main @ 3043787 through //UE4/Orion-Staging #rb none #tests Smoked by engine and dev QA Change 3054491 on 2016/07/18 by Frank.Gigliotti@Frank.Gig_T4217_Orion_Stream Removed warning when client miss-predicts ability activation. * It is valid for the client to miss-predict. Warning was only added to track down a bug. #CodeReview David.Ratti #RB None #Tests None Change 3053850 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Missed checkins on ability system engine work: -Register debug delegate on module startup for easier debugging -Fallback to actor location if no hit impact is specified in default engine GC notify class #rb none #tests ability system sample project Change 3053825 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Fix issue where config file not actually flushed at right time when adding new tags Fix issue where orion projecetile tags that are auto generated was generating tags for non gameplay tag properties #rb DanY #codereview Dan.Youhon #tests pie Change 3053438 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General -Remove developer tags from master tag list before saving to ini file -inline some stuff (wip for gc tag translator system) #rb none #test adding tags Change 3053414 on 2016/07/18 by Robert.Manuszewski@Robert_Manuszewski_NCL_Orion Fixing rare crash when async loading objects caused by linker being detached too early (before other package's import has been fully processed) #jira OR-24955 #jira OR-25183 #rb Graeme.Thornton #tests Win64 cooked client golden path (solo vs AI) Change 3052009 on 2016/07/15 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Overhaul of behavior of headless applications (server, client) (OR-23529). - Removed FApp::ShouldUseNullRHI(). Rationale: FApp::CanEverRender() answers a higher level question and the code shouldn't predicate on the type of RHI used. - Multiple code paths updated to prevent code execution on headless clients (some of this is optimization, some was causing crashes). - Most of these changes originated from a shelved CL by BradA. #rb Michael.Noland #codereview Michael.Noland, Brad.Angelcyk, Andrew.Grant, Chris.Wood, Matt.Schembari #tests Cooked Windows client and server, Linux client and server. Ran Windows client and server, played a match, ran Linux bot (headless client, requires local changes not in this CL), ran the Windows editor (tried PIE). Change 3051926 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Reinstate color grading changes. Fix broken config file. #rb none #tests Agora_p color grading and warning check Change 3051759 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't record predicted elements of fast TArrays into client replays. Fixes issue where the client was incrementing the ReplicationID of predicted elements, potentially conflicting with the IDs of elements received by the server. #jira OR-25234, OR-25413, OR-25403 #tests golden path, bug repo using 'net pktlag', replays #rb john.pollard, david.ratti #ROBOMERGE-SOURCE: CL 3051758 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051702 on 2016/07/15 by Daniel.Lamb@daniel.lamb_T3905_6612 Added jordan walker to rebuild lighting emails. Removed peter.sauerbrei. #rb Peter.Sauerbrei #test none Change 3051661 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging support for precompiled binaries in CIS from Release-29. #rb none #tests none #ROBOMERGE-SOURCE: CL 3051660 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051466 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow seamless upgrade from FVector -> FVector4 for UProperties. #rb Robert.Manuszewski #tests Color grading property changes. Change 3050680 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Mcp, #Orion - Fix initalization values of CatalogServiceMcp #rb none #tests Real money offers show in the store again #ROBOMERGE-SOURCE: CL 3050563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050520 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - MERGING DUI @ CL 3047139 #RB:none #Tests:none [CodeReviewed]: kerrington.smith, dan.hertzka, matt.schembari, benjamin.crocker, jaymee.stanford, alex.conner #ROBOMERGE-SOURCE: CL 3050519 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050465 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't check IsClientOnly() to detemine whether a player controller is local or not. For client replay recording, the replay spectator controller should not return true from IsLocallyControlled(). This change fixes that case in client builds. Fixes issue where the SignificanceManager was using the replay spectator to influence significance values, causing them to be incorrect for the game player controller. #jira OR-25258 #tests bug repro, golden path, replays #rb john.pollard [CodeReviewed] zak.middleton, josh.markiewicz #ROBOMERGE-SOURCE: CL 3050462 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050326 on 2016/07/14 by Dan.Youhon@Dan.Youhon.Paragon Set CameraLensEffects position before activation so that initial significance values are correct, specifically to fix quick camera lens effects being culled out due to incorrect significance #OR-18321 - Moves location determination code from AEmitterCameraLensEffectBase::UpdateLocation into a separate static GetAttachedEmitterTransform function, which is now called both from UpdateLocation and in APlayerCameraManager::AddCameraLensEffect to determine SpawnTransform for the LensEffect SpawnActor call - Unshelved from Jeff.Farris. Thanks Jeff! #rb Dan.Youhon #tests MultiPIE #codereview Jeff.Farris Change 3049749 on 2016/07/14 by Daniel.Lamb@daniel.lamb_T3905_6612 Added skipskin verify to rebuild lighting commandlet. #rb None #test Rebuild lighting commandlet Change 3049728 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: buildmachine Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting #ROBOMERGE-SOURCE: CL 3049727 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049721 on 2016/07/14 by buildmachine@buildmachine_Z4560_OrionDevGeneral Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting Change 3049325 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Back out changelist 3049037 due to incompatibility with current assets #rb none #tests Cooked content and verified warnings & errors are gone. #codereview Marcus.Wasmer, Brian.Karis, HaarmPieter.Duiker Change 3049319 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating More work on content filtering (still disabled) #rb none #tests cooked content and verified filtered content is not found. Change 3049298 on 2016/07/13 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2/29 @ CL 3049113 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3049296 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049269 on 2016/07/13 by Mieszko.Zielinski@mieszko.zielinski_T4675_Orion Constified FObjectFinder::Succeeded because why not #UE4 #rb none #test golden path Change 3049104 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Created delegate for object name resolution and moved existing package localization code to use it. Orion code to filter out unreleased heroes and other data, but correnty disabled due to a cooking bug. #rb none #tests ran editor, ran cooker, verified object resolution is equivalent to before. Change 3049037 on 2016/07/13 by HaarmPieter.Duiker@HPD-Dev-General Adding shadows, midtones and highlights color correction controls #rb brian.karis, marcus.wassmer #tests "postprocess color correction" Change 3048457 on 2016/07/13 by Cody.Haskell@OrionStream #UE4 - Adding a delegate that fires off when LastUserInteractionTime is updated #codereview Matt.Kuhlenschmidt #rb none #tests PIE Change 3048420 on 2016/07/13 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Fix double #undef LOCTEXT_NAMESPACE in editor case. #rb none #codereview Nick.Darnell, Andrew.Grant #tests Compiled Linux editor (for running -server). Change 3047891 on 2016/07/13 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Rollback //Orion/Dev-General/Engine/Source/Runtime/Core/Private/Windows/WindowsWindow.cpp to revision 12 #rb none #tests Tested in editor on PC Change 3047216 on 2016/07/12 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Changes to Linux application specific to Linux client. #rb none #codereview Brad.Angelcyk #tests Ran Paragon Linux client (headless) locally. Change 3047140 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for PS4 #rb #tests na Change 3047107 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Moved timeguards out of stats.h #rb none #tests compiled editor & shipping client Change 3046996 on 2016/07/12 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Don't check bTearOff when deciding whether to swap roles for client replay recording and improve the comment. Fixes an assert that could occur if a torn-off actor happened to get recorded into a checkpoint of a client replay. #tests golden path #rb john.pollard Change 3046975 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Support for making the game window borderless (no system border or title bar). Disabled by default. Enabling requires adding bUseBorderlessWindow=True to [/Script/EngineSettings.GeneralProjectSettings] in DefaultGame.ini. The game using this is responsible for adding WindowTitleBarArea widget to its UI, as well as window minimize/maximize/close buttons. #codereview Dan.Hertzka #rb Jeff.Campeau #tests Tested in editor build on PC Change 3046812 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev New UI for selecting fullscreen mode in Paragon video settings #rb Dan.Hertzka #tests Tested in editor build on PC Change 3046803 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Added an option to WindowTitleBarArea widget to make it toggle fullscreen mode instead of maximizing the window. #rb Dan.Hertzka #tests Tested in editor build on PC Change 3045374 on 2016/07/11 by John.Pollard@John.Pollard_T2802_Orion_DevGeneral Fix assert in channel cleanup code that could occur if the connection was cleaned up, and there were KeepProcessingActorChannelBunchesMap in-flight still #rb RyanG #tests Replays Change 3044696 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Added additional checks to ResavePackagesCommandlet so people don't miss the required allowcommandletrendering flag when using buildlighting option. #test rebuild lighting using resave packages paragon #rb None Change 3044690 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Changed MBWritten cooker stats to report mb instead of bytes... #rb Wes.Hunt. #test cook paragon. Change 3044439 on 2016/07/11 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3043960 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3044428 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) [CL 3070724 by Andrew Grant in Main branch]
2016-07-29 17:10:25 -04:00
/// <summary>
/// Detects the current code changelist the workspace is synced to.
/// </summary>
/// <param name="ClientRootPath">Workspace path.</param>
/// <returns>Changelist number as a string.</returns>
private static string DetectCurrentCodeCL(P4Connection Connection, string ClientRootPath)
{
CommandUtils.LogVerbose("uebp_CodeCL not set, detecting last code CL...");
// Retrieve the current changelist
string P4Cmd = String.Format("changes -m 1 \"{0}/....cpp#have\" \"{0}/....h#have\" \"{0}/....inl#have\" \"{0}/....cs#have\" \"{0}/....usf#have\"", CommandUtils.CombinePaths(PathSeparator.Depot, ClientRootPath));
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3120366) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 2714591 on 2015/10/02 by Ben.Marsh Initial branch of files from Engine-Main (//UE4/Engine-Main) to Dev-Platform (//UE4/Dev-Platform) Change 2916715 on 2016/03/21 by Daniel.Lamb First pass at splitting out build cook run into into seperate scripts. Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3059693 on 2016/07/21 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3061151 on 2016/07/22 by Niklas.Smedberg Fast ASTC texture compression, using ISPC. #jira UE-32308 Change 3061428 on 2016/07/22 by Peter.Sauerbrei Back out changelist 3061151 as it wasn't approved for submission Change 3061970 on 2016/07/22 by Steve.Cano Adding AdMob interstitital ad support for Android, including Blueprint functions #jira UE-33286 #ue4 #android Change 3062160 on 2016/07/22 by Mark.Satterthwaite Fix the fix for handling RHISetStreamSource overriding stride on Metal - not all MTLVertexDescriptors are equally hashable so do this ourselves. #jira UE-33355 Change 3062770 on 2016/07/24 by Brent.Pease UE-32397 Error Message displays as Unknown Error when failing to supply a Remote Build server for ios on Windows Change 3063227 on 2016/07/25 by Dmitry.Rekman Update hlslcc cross-compile after libc++ change. Change 3063314 on 2016/07/25 by Jeff.Campeau Xbox One DLL loading Receipts can be read back by request for target info Change 3063329 on 2016/07/25 by Mark.Satterthwaite CL #3046743 was breaking other samples in unexpected ways after a recent Main merge, so make a Metal-specific change to the shader instead and amend the MetalBackend to better match HLSL's handling of NaN/inf with common single-precision float intrinsics. This is sufficient to fix the AtmosphericFog and the recent regressions. #jira UE-33600 #jira UE-33028 #jira UE-27879 #jira UE-25802 Change 3063492 on 2016/07/25 by Brent.Pease UE-23846 - iOS Movie Player can't handle videos at resolutions that aren't multiples of 16 UE-33200 - A movie isn't played on iOS occasionally. Change 3063729 on 2016/07/25 by Dmitry.Rekman Linux: enable XGE on all platforms. #tests Cross-compiled a number of Linux targets on Windows. Change 3063732 on 2016/07/25 by Dmitry.Rekman Fixed formatting (spaces->tabs) in previous change. Change 3063750 on 2016/07/25 by Daniel.Lamb Added code to dump the cook modification delegate loads to log. Fixed the memory usage output log. #test cook paragon. Change 3063804 on 2016/07/25 by Daniel.Lamb Added cookpartialgc additional commandline option to uat. #test UFE Change 3064008 on 2016/07/25 by Mark.Satterthwaite For non-shipping builds conditionally bind a default uniform buffer in Metal and report an error if the slot was unbound, if our validation layer is enabled attempt to report the shader source in question. This relies on the shader compiler providing accurate information about uniform buffer bindings and won't fix all occurances of bad uniform usage (if a buffer is bound but too short the result will be GPU restarts or an error in Apple's validation layer - we can't detect this case) but will help debug the typical error of leaving an active slot unbound. #jira FORT-27685 Change 3064141 on 2016/07/25 by Jeff.Campeau Rebuild vpxmd.lib with delayed codegen disabled (fixes linker warning building Win64). Change 3065024 on 2016/07/26 by Nick.Shin Change filetype remove exclusive check out bit requested by or.coheni & nick.penwarden Change 3065274 on 2016/07/26 by Jonathan.Fitzpatrick DirectoriesToAlwaysStageAsUFS now properly filters out *.uasset and *.umap files This prevents the bug where cooked assets get trampled by staging their uncooked version on top of them during the UFS step Added a file filter to DirectoriesToAlwaysStageAsUFS for uasset and umap. Change 3066338 on 2016/07/27 by Mark.Satterthwaite Handle releasing an SRV/UAV & the source object within a single Metal command-buffer. #jira UE-33779 Change 3066789 on 2016/07/27 by Daniel.Lamb Realtime mode does not save any packages anymore unless they are ready. #test cookontheside, cookbythebook shooter game Change 3066847 on 2016/07/27 by Jeff.Campeau Fix define #2634 #jira UE-33813 Change 3068868 on 2016/07/28 by Mark.Satterthwaite Extend hlslcc's handling of switch-statements to allow implict casts from scalar bool, half & float as HLSL itself permits while also making sure it errors if the expression input is not scalar. This fixes shader compile errors in UT. Change 3070040 on 2016/07/29 by Dmitry.Rekman Delete Nadzorca. Change 3070947 on 2016/07/29 by Jeff.Campeau Perforce C++ API 2015.2 (includes debug libraries) Change 3073707 on 2016/08/02 by Daniel.Lamb Derived data cache commandlet runs resolve string asset references to load any string asset refereced packages from the map. Also process async results from shaders being compiled so they can have their memory resources released. #test DerivedDataCache commandlet shootergame. Change 3076613 on 2016/08/03 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3076668 on 2016/08/03 by Brent.Pease Back out changelist 3076613 Change 3077157 on 2016/08/04 by Daniel.Lamb Fixed up DLC staging so that it stages to the proper mount point. Fixes up include engine content in DLC staging paths. #test Made up shooter game DLC Change 3077191 on 2016/08/04 by Daniel.Lamb More smartly process async shader compilation if we are waiting for it. #test cook on the side shooter game cook by the book shooter game. Change 3077412 on 2016/08/04 by Mark.Satterthwaite Fix "iOS Metal-based build crashes at launch with sub-levels": - Slate should not bind the null RHI texture from an unitialised texture atlas - atlases only have a valid texture pointer once an entry has been added to them and in the template projects an empty sub-level doesn't add anything. - To prevent this kind of bug resurfacing and being so hard to track down add Metal shader binding validation to our validation layer as Apple's is incomplete on iOS and won't warn us about nil texture usage which causes these GPU restarts. This requires reworking our vertex declaration handling to be more efficient so that we can cache the pipeline reflection data as well as the pipeline objects. - Fix validation error of texture reallocation on loading template projects under Metal. #jira UE-30847 Change 3077958 on 2016/08/04 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3079503 on 2016/08/05 by Mark.Satterthwaite Initialise more variable types to 0 in Metal shaders to workaround Xcode 8 toolchain no longer doing this for us for "threadgroup shared" variables. Everything but structs and atomic's will now be initialised. #jira UE-33856 Change 3079737 on 2016/08/05 by Jeff.Campeau Add support for delay load DLLs on Xbox One Turn off warnging for missing PDBs to match VCToolchain.cs Change 3081005 on 2016/08/08 by Mark.Satterthwaite Fix-up Metal device name on AMD for macOS 10.12 which reports it correctly and enable tiled reflections on Intel from macOS 10.12 too as they now work. Change 3081557 on 2016/08/08 by Daniel.Lamb File-> Package saves all packages before starting packaging. #test File package first person template Change 3082215 on 2016/08/09 by Lee.Clark PS4 - Added 4k profile Change 3082412 on 2016/08/09 by Daniel.Lamb Fixed cook on the fly server not handling cook requests. #test Cook on the fly shooter game. Change 3082955 on 2016/08/09 by Dmitry.Rekman Linux: convert existing Strcat() uses to Strncat(). - Strcat() does not check destination size so can silently corrupt memory. While this was not observed, this conversion removes this concern altogether. Change 3083772 on 2016/08/10 by Luke.Thatcher [PLATFORM] [PS4] [+] Checking in PS4CrashHandler files so we have a copy in Perforce rather than just on the server. - Taken from \\devweb-02 and removed all the unused files/dependencies. - Created a publish profile pointing to \\devweb-02\Sites\PS4Services\PS4CrashHandlerDev so I'm not writing over the existing deployed crash handler. - Moved all code in the Page_Load event to inside the check for the HTTP method (POST) otherwise GET'ing the page from a browser will generate crash folders that hang around forever. Change 3085450 on 2016/08/11 by Lee.Clark PS4 - Fix mediaplayer pipeline allocation Change 3086360 on 2016/08/11 by Michael.Trepka Fixed a non-unity build error in Mac UnrealFrontend Change 3087224 on 2016/08/12 by Luke.Thatcher [PLATFORM] [PS4] [~] Refactor PS4 Crash Handler site - Removed CoreDumpHandler. Processing dump files is handled directly by an async thread within the aspx process. - Separated configuration values into their own class. Currently set to output to a testing directory, rather than the actual crash reporter landing zone. - Added a debug upload page to allow manual submission of .orbisdmp/.txt settings files, accessible by GET'ing Default.aspx. - Added logging. Logs self-delete after 30 days. Testing required before we switch to the new system. #jira UE-34504 #jira OR-26886 Change 3087626 on 2016/08/12 by Dmitry.Rekman PR #2689: Fix copying/duplicating failing on Linux (UE-34586). - Contributed by Web-eWorks. Change 3087991 on 2016/08/12 by Mark.Satterthwaite Initial AVFoundation implementation of Media Framework for Mac, iOS & tvOS. - Video playback occurs via AVPlayerItemVideoOutput's attached to the AVPlayerItem's output. This means gathering video samples is trivial. - Metal texture updates occur by wrapping the texture object provided by AVF - for Mac this is simple as it can bind to the IOSurface directly, for iOS/tvOS we have to create a CVMetalTextureCache and allocate our texture from there. - OpenGL and OpenGLES currently have to lock the pixel buffer and upload to a texture the old fashioned way - this should be revisited when there is time. - Subtitles/Captions are captured using AVPlayerItemLegibleOutput which also connects to the AVPlayerItem's output. - On Mac audio samples are returned by manually reading from the stream using an AVAssetReaderTrackOutput, including manual seeking and synching. - On iOS/tvOS the audio is played directly by AVPlayer because the IOSAudio system can't handle procedural buffers - otherwise it could reuse the Mac code. - AVFoundation does not support AVI - that's an obsolete Microsoft/Windows file-format. - Only 'file://' URLs are supported - streaming would require a totally different audio solution (using MTAudioProcessingTap) and has many more edge and failure cases that would need to be handled. #jira UE-34315 Change 3088790 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [~] Hook new PS4 crash handler up to the crash reporter website. - Removed indentation from generated crash context XML file. The crash reporter process does manual XML parsing which doesn't correctly handle whitespace at the start of lines. - Switched the final output folder to match the one the crash reporter process is watching. - Hide upload form on a config variable. #jira UE-34504 #jira OR-26886 Change 3089060 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [!] Change PS4 crash handler log file extension to ".ps4chlog", otherwise the crash reporter site attaches the wrong log file to the crash report. Allowed showing of debug upload form via "Default.aspx?showform=1" query string. #jira UE-34504 #jira OR-26886 Change 3089089 on 2016/08/15 by Mark.Satterthwaite Duplicated changes to AppleMovieStreamer from CL #3088149. #jira UE-34315 Change 3089460 on 2016/08/15 by Mark.Satterthwaite Duplicate CL #3080971: Workaround a macOS 10.12 Beta bug on some Metal drivers that can't initialise temporary/local variable arrays, only those that are marked threadgroup shared. #jira UE-34355 Change 3089465 on 2016/08/15 by Mark.Satterthwaite For Metal shader translation retain more precision for float constants -1.0f >< 1.0f by emitting them in scientific notation - prevents Hammersley constant amongst others from being flushed to 0. Change 3089902 on 2016/08/15 by Daniel.Lamb Changed the next compiling ID to the correct compiling ID. #test Cook Change 3089903 on 2016/08/15 by Daniel.Lamb Cooker monitors config useage during cook and uses those settings to invalidate cooked content instead of all config settings. Change 3090114 on 2016/08/16 by Luke.Thatcher [PLATFORM] [PS4] [~] Minor change to PS4 settings text on crash handler site. Change 3090949 on 2016/08/16 by Nick.Shin WebSocketNetDriver crash fix filled in missing chunk of code that calls PacketHandler's "packet modifiers" #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket #code.review john.pollard john.barrett Change 3091265 on 2016/08/16 by Brent.Pease Add IOS support to HarfBuzz Change 3091267 on 2016/08/16 by Brent.Pease Add references to fix mono build Change 3091291 on 2016/08/16 by Nick.Shin CIS warning fix #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket Change 3091781 on 2016/08/17 by Joe.Barnes UE-33640: Exposed UPrimitiveComponent::IsAnyRigidBodyAwake() to Blueprints. Change 3092687 on 2016/08/17 by Daniel.Lamb Added support for using binned allocator in cooker instead of tbb. #test Cook shootergame. Change 3093867 on 2016/08/18 by Mark.Satterthwaite Use a read/write mutex to protect access to Metal's internal shader pipeline caches so that parallel threads can progress in the common case where new shaders are not being compiled. Change 3093950 on 2016/08/18 by Mark.Satterthwaite Change the Mac GPU identification code to cope with AMD's new naming scheme on 10.12. Change 3093951 on 2016/08/18 by Mark.Satterthwaite More SCW threads on Mac - they work now. Change 3093960 on 2016/08/18 by Mark.Satterthwaite Increase the default number of command-buffers on Mac because bigger games overflow the current limit of 64 per queue. Change 3096493 on 2016/08/22 by Jeff.Campeau Use Xbox version of DirectX include. Change 3097509 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor PS4 Symbol Publish - Moved the SymStore task from Win.Automation to BuildGraph.Automation, and made it more generic. - The specifics of uploading symbols are now implemented in the platform tool chain, alongside StripSymbols(). - Re-generated the build graph schema file. - Removed the old PS4 symbols upload path in the package step. Modified OrionBuild.xml to publish symbols for all PS4 dev, test and shipping config builds of OrionClient. Change 3097635 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor Age Symbols task in UAT. - Moved the AgeStore task from Win.Automation to BuildGraph.Automation and made it more generic. - Symbol server directory structure is now defined by the platform tool chain, which the common task uses to clean out old symbols. - Added a "filter" parameter to prevent age tasks deleting symbols from unrelated builds in shared symbol servers. Modified OrionBuild.xml to age both the Windows and PS4 symbol stores. Change 3097713 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Enable new PS4 crash handler server - Created live deployment profile and applied the required config file changes. Change 3099214 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix compile error in PS4 tool chain. For some reason, this only breaks ocassionally. Maybe we're alternating between the 2013 and 2015 C# compilers depending on what initiates the build (e.g. Visual Studio vs GenerateProjectFiles)? Change 3099222 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [+] Added PS4 support for FPlatformMisc::MessageBoxExt using the MsgDialog library. - Note, only one and two button message dialogs are supported (limitation of MsgDialog). Change 3099260 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [~] Better PS4 exit function. Calls quick_exit instead of abort when we've not asserted. Allows for a "cleaner" forced exit without generating a crash dump. Change 3101192 on 2016/08/25 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3101944 on 2016/08/25 by Daniel.Lamb Ask to save the current level when we are using launch on. Change 3102036 on 2016/08/25 by Nick.Shin check for minimum expected size upon data received from network #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 3102115 on 2016/08/25 by Brent.Pease - Fix small errors that probably only show up in the mac mono build #code.review peter.sauerbrei Change 3102747 on 2016/08/26 by Jeremiah.Waldron Re-submitting OnlineSubsystemGameCircle with TPS permission for Amazon SDK - Also fixed the plugin to remove any related files from the final package when IAP is disabled or GameCircle support itself is disabled with the plugin still enabled - Added support for new AlreadyOwned IAP response code as well which is already used for GooglePlay and IOS Change 3102900 on 2016/08/26 by Nick.Shin since last checkin (CL: 2981945) - prints are crashing the browser - this change will allow browser to print the details via console.log() #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 3103130 on 2016/08/26 by Brent.Pease UE-24679 - Enable the ability to change ports for a firewall to pass them through rsync Change 3103225 on 2016/08/26 by Daniel.Lamb Fixed issue with warning which would cause crash. Change 3103425 on 2016/08/26 by Dmitry.Rekman Enable offscreen GL rendering without X. - Added new video subsystem to SDL that is uses EGL to initialize the context. - Most windoing functions stubbed. - Also added a new test case to TestPAL for easier debugging. Change 3104743 on 2016/08/29 by Brent.Pease Support remote offline metal shader compilation Change 3105051 on 2016/08/29 by Brent.Pease UE-2382 - TASK: MobleMVP: iOS: Add ability to view iOS device console output in the editor UFE - IOS Automation will now create a thread to collect the console logs from the device and send them to C# Console output while the app is running on device - Made ProcessResult an interface (IProcessResult) which ProcessResult implements. This allows platforms to provide their own implementation if needed. - Moved the RunLoop related parts of CoreFoundation into MobileDevice.cs Change 3105053 on 2016/08/29 by Brent.Pease - IOS dll's as part of the last check-in Change 3106853 on 2016/08/30 by Jeff.Campeau Implement FD3D11DynamicRHI::RHICreateComputeFence to prevent memory overwrite Change 3107361 on 2016/08/30 by Dmitry.Rekman Renderer: changes to allow postproc delegates. Change 3107362 on 2016/08/30 by Dmitry.Rekman Plugin with a CUDA postproc example. - Linux version only. Runs under a headless GL too (without X). - Disabled during cross-compilation, can be compiled natively only. - CUDA kernel should be compiled separately, CMakefile with compilation attached (can be used to generate VStudio projects as well). - To test the output, run under the debugger, interrupt and set global variable GSaveTheOutput to 50 (this will write out kernel output buffer 50 times as .bmp files into working directory). Change 3107913 on 2016/08/31 by Daniel.Lamb Fixed loading of cooked content in the editor. Change 3107916 on 2016/08/31 by Daniel.Lamb Added error case when shader compilation fails to notify shader. #test Cook shooter game. Change 3108080 on 2016/08/31 by Josh.Adams - Fixed PS4Automation compile errors Change 3109077 on 2016/08/31 by Brent.Pease Fix C# debug builds by specifying x64 and add reference to MobileDeviceInterface Change 3110086 on 2016/09/01 by Dmitry.Rekman Fix race condition in PThread runnable (UE-35074). - Instead of relying on busy-wait, join the threads. This prevents race between PostRun() (executed in the context of the thread) and FPThreadRunnableThread() destructor (see UE-34909). - Do not use an invalid value for pthread_t, since there's none. Change 3110172 on 2016/09/01 by Dmitry.Rekman Fixed a crash exiting VR Preview on Windows GL4 (UE-28708). - PR #2188 submitted by ardneran. Change 3110313 on 2016/09/01 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3111134 on 2016/09/01 by Dmitry.Rekman UBT: prevent mono from hanging on Ctrl-C. - Sometimes Ctrl-C can cause thread creation to fail. Without this change, UBT would lock up. Change 3111171 on 2016/09/01 by Brent.Pease Move all C# projects to use the x64 Platform for consistency with other changes made to move to the x64 Platform Change 3111177 on 2016/09/01 by Dmitry.Rekman Fix Linux build on systems without CUDA (UE-35460). Change 3111548 on 2016/09/02 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix for PS4 iterative deployment. - Changes in Dev-Mobile broke the deployment manifests, as PS4 was now using the wrong filename when creating delta and obsolete file lists. Change 3111863 on 2016/09/02 by Dmitry.Rekman Better fix for build without CUDA (UE-35460). Change 3112738 on 2016/09/02 by Mark.Satterthwaite Fix the pausing particles on Metal - one line bug in the Metal query implementation meant that the first query wouldn't return the correct result for no good reason. #jira UE-34989 Change 3114579 on 2016/09/06 by Chris.Babcock Fix Vulkan include path in NDK check (contributed by geediiiiky) #jira UE-35490 #github #2758 #ue4 #android Change 3115115 on 2016/09/06 by Jeff.Campeau Calculate buffer size for paks using the bitwindow override as needed Change 3115600 on 2016/09/07 by Luke.Thatcher [PLATFORM] [PS4] [~] Make the crash dump handler registration much earlier, to catch crashes in early engine init. - Fixed up places in FGenericCrashContext::SerializeContentToBuffer which used the command line. If we crash early, the command line may not have been initialized yet. - Added a GetNoInit function to FThreadHeartBeat to avoid creating the heart beat thread if we crash early, and the thread doesn't exist yet. Tested by calling abort() immediately inside int main(), and we get a valid crash dump that the crash handler service can consume. Change 3115676 on 2016/09/07 by Luke.Thatcher [PLATFORM] [~] Dev-Platform integration fix for original CL 3064888 in //Orion/Release-29.1 Add .exe and .dll to windows symbol upload file filters. Change 3115811 on 2016/09/07 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3115944 on 2016/09/07 by Michael.Trepka Implemented IsGamepadAttached() for Mac Change 3115948 on 2016/09/07 by Michael.Trepka Don't try to restore Help menu item on Mac if MenuBlock does not contain it Change 3116200 on 2016/09/07 by Jeff.Campeau Fix parameter ordering Change 3117660 on 2016/09/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3117728 on 2016/09/08 by Michael.Trepka Copy of CL 3117698 by Mike.Fricker Fixed regression with editor's Simulate mode where cursor would teleport back to the center of the viewport after every click - This bug was introduced in CL 3075932 from a borderless window cursor handling fix that was needed for games that capture the cursor Change 3117797 on 2016/09/08 by Peter.Sauerbrei Shader Resource compression Change 3117988 on 2016/09/08 by Brent.Pease - Solutiion generator will now pick x64 instead of AnyCPU for the default platform configuration - Fix what I think was a merge error in BuildGraph.cs Change 3118296 on 2016/09/08 by Daniel.Lamb Fixed crash with launch on. Couldnt' correctly detect previous generated ini settings. #test launch on QA game #jira UE-35741 Change 3118438 on 2016/09/08 by JohnHenry.Carawon Fix UAT compilation on Linux #UE-35745 Change 3118934 on 2016/09/08 by Jeff.Campeau Shader compression setting based on target platform instead of cooking host platform. #jira UE-35753 Change 3120190 on 2016/09/09 by Ben.Marsh Add missing Platform attribute to build script for Dev-Platform. [CL 3120378 by Josh Adams in Main branch]
2016-09-09 20:13:41 -04:00
IProcessResult P4Result = Connection.P4(P4Cmd, AllowSpew: false);
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3064255) #lockdown Nick.Penwarden Change 3063869 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Added a cvar (t.FPSChart.OpenFolderOnDump) to control whether or not FPS charts automatically open the profiling folder when stopfpschart is executed, which can be useful to avoid a bunch of open windows while doing automated testing #rb marcus.wassmer #tests Tested startfpschart + stopfpschart with t.FPSChart.OpenFolderOnDump set to 1 and 0 #codereview david.nikdel Change 3063829 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Core: Added an optional size to MallocLeak Stop and made the default filter size 128 KB for both MallocLeak Dump and MallocLeak Stop if no size was specified #rb marcus.wassmer #tests Tested using MallocLeak Stop and MallocLeak Dump Change 3063825 on 2016/07/25 by Michael.Noland@mnoland_T2801_OrionStream Engine: Exposed GPU revision ID as GRHIDeviceRevision and added it to the FPS chart analytics (gathered on D3D11 and D3D12 only) #rb marcus.wassmer #tests Tested on my desktop and compared to dxdiag output Change 3063702 on 2016/07/25 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Collect garbage when scrubbing in a replay. Scrubbing generates a lot of garbage, and can lead to running out of memory. Can be disabled with the cvar demo.LoadCheckpointGarbageCollect. #jira OR-25964 #tests bug repro #rb john.pollard Change 3063426 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Borderless window support improvements: - the cursor changes to resize when hovering over the window edge - added a way for widgets to register a delegate that's called when window actions occur (maximize, restore, etc.) - used he window action notification for WindowTitleBarArea to improve how toggling fullscreen on double click is handled #rb Jeff.Campeau #tests Tested in editor build on PC Change 3063358 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3063307 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3063345 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063353 on 2016/07/25 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging CL 3037547 and CL 3037552 from //UE4/Dev-Build to support BuildPatchTool analytics. #rb none #tests none #ROBOMERGE-SOURCE: CL 3063156 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3063198 on 2016/07/25 by Matt.Kuhlenschmidt@matt.kuhlenschmidt_orion_dev Temp fix for broken post process volumes #rb none #tests none Change 3063166 on 2016/07/25 by Daniel.Lamb@daniel.lamb_T3905_6612 Added check to Redirect collector resolve string asset references. #rb none #test cook paragon Change 3063057 on 2016/07/25 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Use round corners for windows with no system title bar and border only in windowed mode. #rb Peter.Sauerbrei #tests Tested in editor build on PC Change 3063015 on 2016/07/25 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim notifies not working when playing animation on blueprint-driven skeletal meshes We now inject a new animation position into the animation system, rather than trying to 'fake' events outside of the system. This allows for much more robust event triggering when playing back through sequencer. Previously, anim notifies for trail particles would be reset every frame due to TriggerAnimNotifies being called by the animation system, and sequencer. We now defer this responsibility to the animation system entirely during playback. #tests Tested sequencer driven animation with animation assets and (compatible) animation blueprints. Tested some non-sequencer animation. #rb Benn.Gallagher Change 3062774 on 2016/07/24 by Ben.Marsh@Ben.Marsh_T3245_Orion BuildGraph: Fix <Cook> tasks failing when multiple platforms are specified, due to not scanning the output directories separately. #rb none #tests preflight Change 3062761 on 2016/07/24 by Andrew.Grant@andrew.grant.T6730.orion.floating Non-unity fix #rb none #tests compiled Change 3062324 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Skipped a file #rb none #test none Change 3062315 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow r.SSR.MaxRoughness in shipping builds. Art has been tweaking with this value, but it's not being honored in shipping. #rb none #tests adjusted settings in agora_p Change 3062306 on 2016/07/22 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral HLOD distance scalability option (r.HLOD.DistanceScale) Higher values make HLODS transition further away. #rb Michael.Noland #tests Tested in agora_p Change 3061861 on 2016/07/22 by Lina.Halper@Lina.Halper_Orion Fix Compression - Reduce functions to be editoronly #rb: Martin.Wilson #tests: PIE/compile editor build/noneditor Change 3061714 on 2016/07/22 by Andrew.Rodham@Andrew.Rodham_Orion Sequencer: Fixed anim trails not playing in full, sequencer-driven animation. There were 2 issues here. Firstly, we were force-handling events and anim notifies in non-preview animation which caused undefined behaviour when the animation was also updated on tick. Secondly, On the very first frame of a game, sequencer can sometimes use the PreviewSetMatineeAnimPositionInner method because the actor it is referencing has not begun play yet. Unfortunately this function left the animation in a state where the 'real' animation update function wouldn't trigger any anim notifies properly. #tests Tested animation with and without anim trails to verify they work in editor, PIE and standalone game with and without sequencer open. Rendered out the announce trailer before and after my changes to verify there was no change in behaviour. #jira OR-25967 #review-3061494 @Max.Chen #rb Benn.Gallagher Change 3061393 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: sam.zamani compile errors #rb none #tests compile #ROBOMERGE-SOURCE: CL 3061392 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3061384 on 2016/07/22 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: andrew.grant Fixed build breakage #rb none #tests compiled PS4 client #ROBOMERGE-SOURCE: CL 3061383 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060894 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion, #OnlineSubsystem, #OnlineGameplayFramework - Game catalog supports Price Engine sales on real-money offers #rb Sam.Zamani #tests Real-money offers that are on sale show the correct sale price / discount display #jira OR-21659 #ROBOMERGE-SOURCE: CL 3060891 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3060272 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion Fix compile issue of non editor build #rb: none #tests: compile Change 3060161 on 2016/07/21 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Duplicate 3046845 CVAR threading crash fix. #rb none #tests compiled, ran ps4 Change 3060012 on 2016/07/21 by Lina.Halper@Lina.Halper_Orion - Back out changelist 3056611 - Fix additive issue and built the new animation DDC #rb: Martin.Wilson #tests: Jump_Recovery_Additive, PIE Change 3060009 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream When receiving NotLeader party join rejection, include the new leader id and re-attempt the join to the new leader #jira OR-25648 #rb bart.bressler #tests frontend parties with promotions, coop matchmaking Change 3059989 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Fixes for applocal redist #rb none #test built locally Change 3059832 on 2016/07/21 by Martin.Wilson@MartinWilsonOrionStream Fix graph linked external object saving error on re-compressed animations (dup from dev-framework CL ) #jira UE-33567 #rb Thomas.Sarkanen #tests In editor testing that animations can be recompressed and saved Change 3059803 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating Switching Orion, UnrealCEFSubProcess, and CrashReporterClient to build with VS2015 Added AppLocalPrerequisitesDirectory editor setting that is passed in -applocaldir during staging WinPlatformAutomation now stages applocaldir to project and engine binaries Updated OrionBuild.xml to specify -applocaldir #codereview Jeff.Campeau, Ben.Marsh #rb none #tests build client locally and verified DLLs are local to executables Change 3059707 on 2016/07/21 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix case where DefaultGameplayTags.ini fails to update if not checked out from source control #rb none #tests add tags without source control Change 3059679 on 2016/07/21 by Rob.Cannaday@rob.cannaday_orion-stream Fix nonunity compile error due to OnlinePresenceInterface.h requiring enum defined in OnlineSubsystemTypes.h #rb paul.moore #tests compile with OrionFriendItem.cpp modified Change 3059518 on 2016/07/21 by Andrew.Grant@andrew.grant.T6730.orion.floating AppLcoalDependencies required by VS2015 Change 3059477 on 2016/07/21 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3059419 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3059476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3059455 on 2016/07/21 by Graeme.Thornton@GThornton_Orion_DevGeneral Linux build fix (bad case on #include filename) #rb robert.manuszewski #tests compiled Paragon on a linux machine Change 3059258 on 2016/07/21 by Simon.Tovey@Simon.Tovey_OrionDev Implementing 3050352 in Dev-General. #rb none #tests Editor #codereview Marcus.Wassmer Change 3058989 on 2016/07/21 by Michael.Noland@mnoland_T2801_OrionStream Audio: Disabling the audio thread to prevent a crash in async line trace code (it is already disabled in UE4 main) #rb none #codereview andrew.grant, ori.cohen Change 3058773 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Remove QoS* from junk manifest #review-3058772 @Rob.Cannaday #rb none #tests QoS module doesn't get nuked every build #ROBOMERGE-SOURCE: CL 3058771 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058717 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added submitted CL to success email for rebuild lighting commandlet. Removed nosimplygon from resave lighting commandlet commandline. #rb Daniel.Wright #test rebuildlighting paragon devgeneral. Change 3058565 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Orion - Fix debug/non-development builds #rb Rob.Cannaday #tests it builds (and doesn't crash on login) on Debug Editor -debug -game! #ROBOMERGE-SOURCE: CL 3058563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3058082 on 2016/07/20 by Daniel.Lamb@daniel.lamb_T3905_6612 Added error to the lighting build whent it fails to build. #test Rebuild lighting commandlet #rb Daniel.Wright Change 3057945 on 2016/07/20 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for NAN issue introduced in 3032847 #rb Jeff.Farris #tests none Change 3057840 on 2016/07/20 by David.Ratti@David.Ratti_G6218_Orion.Dev-General fix developer tags not properly adding to perforce when creating a new file #rb none #tests developer tags Change 3057553 on 2016/07/20 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 29.2 @ CL 3057330 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3057549 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3057313 on 2016/07/20 by bruce.nesbit@BNesbit_Orion_Stream_1 Fixed shadowvariable in FAnalyticsEventEntry #rb none #tests compiled #codereview Wes.Hunt Change 3056802 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Fix issue where replicated map-placed actors with ability system components would cache an incorrect Role value. This could cause predicted gameplay effects in the fast TArray to have MarkItemDirty called on them, which in turn increments the item's ReplicationID, potentially causing a conflict with the server's ReplicationID. Since the Role may not be correct during OnRegister for these components, also cache it BeginPlay. #jira OR-25234 #rb david.ratti #tests golden path, bug repro #ROBOMERGE-SOURCE: CL 3056801 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3056797 on 2016/07/19 by Wes.Hunt@WHUNT-ORION-STREAM OrionAnalytics updates. * Added IAnalyticsProviderET::SetDefaultEventAttributes to use to set the GameSessionID on all Orion Analytics events. * Removed OrionAnalyticsProvider as it was no longer necessary. * Updated all Orion code to use IAnalyticsProviderET directly in the code to be able to access all the new APIs. #rb sam.zamani, jason.bestimt #tests run dedicated server with 10 bot clients, observe analytics events sending correctly. Ran PIE. #jira UE-30980 Change 3056611 on 2016/07/19 by Lina.Halper@Lina.Halper_Orion Fix for additive broken with remove linear key - DDC key has been changed, so it will require to build DDC from this #rb: Martin.Wilson #tests: Jump_Recovery_Additive in editor, and PIE Change 3056226 on 2016/07/19 by Lukasz.Furman@Lukasz.Furman_T7320_OrionStream extended gameplay debugger's ability category to show locally owned gameplay tags #orion #rb none #tests PIE Change 3056204 on 2016/07/19 by Jeff.Campeau@jeff.campeau_3753_Orion Fix offset rendering of maximized borderless game window on Windows. #review-3055205 @michael.trepka #rb Michael.Trepka #tests Tested in editor build on PC (editor window normal and maximized, game window borderless normal and maximized, game window bordered normal and maximized). Change 3056028 on 2016/07/19 by Rob.Cannaday@rob.cannaday_orion-stream Add moved modules to JunkManifest.txt Change 3055650 on 2016/07/19 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - ACTUAL Merge 29.2 @ CL 3055553 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3055647 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3055620 on 2016/07/19 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Attempts to fix rare server crashes (OR-24947, OR-24952). - Rearranging to avoid AddDefaulted(), that might be triggering a compiler bug (conjecture). #rb Steve.Robb #codereview Steve.Robb #tests Compiled Windows client and Linux server, played a match. Change 3054587 on 2016/07/18 by Andrew.Grant@andrew.grant.T6730.orion.floating Merging from //UE4/Main @ 3043787 through //UE4/Orion-Staging #rb none #tests Smoked by engine and dev QA Change 3054491 on 2016/07/18 by Frank.Gigliotti@Frank.Gig_T4217_Orion_Stream Removed warning when client miss-predicts ability activation. * It is valid for the client to miss-predict. Warning was only added to track down a bug. #CodeReview David.Ratti #RB None #Tests None Change 3053850 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Missed checkins on ability system engine work: -Register debug delegate on module startup for easier debugging -Fallback to actor location if no hit impact is specified in default engine GC notify class #rb none #tests ability system sample project Change 3053825 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General Fix issue where config file not actually flushed at right time when adding new tags Fix issue where orion projecetile tags that are auto generated was generating tags for non gameplay tag properties #rb DanY #codereview Dan.Youhon #tests pie Change 3053438 on 2016/07/18 by David.Ratti@David.Ratti_G6218_Orion.Dev-General -Remove developer tags from master tag list before saving to ini file -inline some stuff (wip for gc tag translator system) #rb none #test adding tags Change 3053414 on 2016/07/18 by Robert.Manuszewski@Robert_Manuszewski_NCL_Orion Fixing rare crash when async loading objects caused by linker being detached too early (before other package's import has been fully processed) #jira OR-24955 #jira OR-25183 #rb Graeme.Thornton #tests Win64 cooked client golden path (solo vs AI) Change 3052009 on 2016/07/15 by Dmitry.Rekman@RCL_Win_Stream-ORMAIN Overhaul of behavior of headless applications (server, client) (OR-23529). - Removed FApp::ShouldUseNullRHI(). Rationale: FApp::CanEverRender() answers a higher level question and the code shouldn't predicate on the type of RHI used. - Multiple code paths updated to prevent code execution on headless clients (some of this is optimization, some was causing crashes). - Most of these changes originated from a shelved CL by BradA. #rb Michael.Noland #codereview Michael.Noland, Brad.Angelcyk, Andrew.Grant, Chris.Wood, Matt.Schembari #tests Cooked Windows client and server, Linux client and server. Ran Windows client and server, played a match, ran Linux bot (headless client, requires local changes not in this CL), ran the Windows editor (tried PIE). Change 3051926 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Reinstate color grading changes. Fix broken config file. #rb none #tests Agora_p color grading and warning check Change 3051759 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't record predicted elements of fast TArrays into client replays. Fixes issue where the client was incrementing the ReplicationID of predicted elements, potentially conflicting with the IDs of elements received by the server. #jira OR-25234, OR-25413, OR-25403 #tests golden path, bug repo using 'net pktlag', replays #rb john.pollard, david.ratti #ROBOMERGE-SOURCE: CL 3051758 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051702 on 2016/07/15 by Daniel.Lamb@daniel.lamb_T3905_6612 Added jordan walker to rebuild lighting emails. Removed peter.sauerbrei. #rb Peter.Sauerbrei #test none Change 3051661 on 2016/07/15 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ben.marsh Merging support for precompiled binaries in CIS from Release-29. #rb none #tests none #ROBOMERGE-SOURCE: CL 3051660 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3051466 on 2016/07/15 by Marcus.Wassmer@Marcus.Wassmer_Orion_DevGeneral Allow seamless upgrade from FVector -> FVector4 for UProperties. #rb Robert.Manuszewski #tests Color grading property changes. Change 3050680 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ian.fox #Mcp, #Orion - Fix initalization values of CatalogServiceMcp #rb none #tests Real money offers show in the store again #ROBOMERGE-SOURCE: CL 3050563 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050520 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - MERGING DUI @ CL 3047139 #RB:none #Tests:none [CodeReviewed]: kerrington.smith, dan.hertzka, matt.schembari, benjamin.crocker, jaymee.stanford, alex.conner #ROBOMERGE-SOURCE: CL 3050519 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050465 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: ryan.gerleve Don't check IsClientOnly() to detemine whether a player controller is local or not. For client replay recording, the replay spectator controller should not return true from IsLocallyControlled(). This change fixes that case in client builds. Fixes issue where the SignificanceManager was using the replay spectator to influence significance values, causing them to be incorrect for the game player controller. #jira OR-25258 #tests bug repro, golden path, replays #rb john.pollard [CodeReviewed] zak.middleton, josh.markiewicz #ROBOMERGE-SOURCE: CL 3050462 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3050326 on 2016/07/14 by Dan.Youhon@Dan.Youhon.Paragon Set CameraLensEffects position before activation so that initial significance values are correct, specifically to fix quick camera lens effects being culled out due to incorrect significance #OR-18321 - Moves location determination code from AEmitterCameraLensEffectBase::UpdateLocation into a separate static GetAttachedEmitterTransform function, which is now called both from UpdateLocation and in APlayerCameraManager::AddCameraLensEffect to determine SpawnTransform for the LensEffect SpawnActor call - Unshelved from Jeff.Farris. Thanks Jeff! #rb Dan.Youhon #tests MultiPIE #codereview Jeff.Farris Change 3049749 on 2016/07/14 by Daniel.Lamb@daniel.lamb_T3905_6612 Added skipskin verify to rebuild lighting commandlet. #rb None #test Rebuild lighting commandlet Change 3049728 on 2016/07/14 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: buildmachine Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting #ROBOMERGE-SOURCE: CL 3049727 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049721 on 2016/07/14 by buildmachine@buildmachine_Z4560_OrionDevGeneral Remove simplygon from rebuild lighting commandlet #rb none #test rebuild lighting Change 3049325 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Back out changelist 3049037 due to incompatibility with current assets #rb none #tests Cooked content and verified warnings & errors are gone. #codereview Marcus.Wasmer, Brian.Karis, HaarmPieter.Duiker Change 3049319 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating More work on content filtering (still disabled) #rb none #tests cooked content and verified filtered content is not found. Change 3049298 on 2016/07/13 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2/29 @ CL 3049113 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3049296 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3049269 on 2016/07/13 by Mieszko.Zielinski@mieszko.zielinski_T4675_Orion Constified FObjectFinder::Succeeded because why not #UE4 #rb none #test golden path Change 3049104 on 2016/07/13 by Andrew.Grant@andrew.grant.T6730.orion.floating Created delegate for object name resolution and moved existing package localization code to use it. Orion code to filter out unreleased heroes and other data, but correnty disabled due to a cooking bug. #rb none #tests ran editor, ran cooker, verified object resolution is equivalent to before. Change 3049037 on 2016/07/13 by HaarmPieter.Duiker@HPD-Dev-General Adding shadows, midtones and highlights color correction controls #rb brian.karis, marcus.wassmer #tests "postprocess color correction" Change 3048457 on 2016/07/13 by Cody.Haskell@OrionStream #UE4 - Adding a delegate that fires off when LastUserInteractionTime is updated #codereview Matt.Kuhlenschmidt #rb none #tests PIE Change 3048420 on 2016/07/13 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Fix double #undef LOCTEXT_NAMESPACE in editor case. #rb none #codereview Nick.Darnell, Andrew.Grant #tests Compiled Linux editor (for running -server). Change 3047891 on 2016/07/13 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Rollback //Orion/Dev-General/Engine/Source/Runtime/Core/Private/Windows/WindowsWindow.cpp to revision 12 #rb none #tests Tested in editor on PC Change 3047216 on 2016/07/12 by Dmitry.Rekman@RCL_Lnx_CaseIns_Stream-ORMAIN Changes to Linux application specific to Linux client. #rb none #codereview Brad.Angelcyk #tests Ran Paragon Linux client (headless) locally. Change 3047140 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Fix for PS4 #rb #tests na Change 3047107 on 2016/07/12 by Andrew.Grant@andrew.grant.T6730.orion.floating Moved timeguards out of stats.h #rb none #tests compiled editor & shipping client Change 3046996 on 2016/07/12 by Ryan.Gerleve@Ryan.Gerleve_T3703_Orion Don't check bTearOff when deciding whether to swap roles for client replay recording and improve the comment. Fixes an assert that could occur if a torn-off actor happened to get recorded into a checkpoint of a client replay. #tests golden path #rb john.pollard Change 3046975 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Support for making the game window borderless (no system border or title bar). Disabled by default. Enabling requires adding bUseBorderlessWindow=True to [/Script/EngineSettings.GeneralProjectSettings] in DefaultGame.ini. The game using this is responsible for adding WindowTitleBarArea widget to its UI, as well as window minimize/maximize/close buttons. #codereview Dan.Hertzka #rb Jeff.Campeau #tests Tested in editor build on PC Change 3046812 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev New UI for selecting fullscreen mode in Paragon video settings #rb Dan.Hertzka #tests Tested in editor build on PC Change 3046803 on 2016/07/12 by Michael.Trepka@Michael.Trepka_T3244_Orion-Dev Added an option to WindowTitleBarArea widget to make it toggle fullscreen mode instead of maximizing the window. #rb Dan.Hertzka #tests Tested in editor build on PC Change 3045374 on 2016/07/11 by John.Pollard@John.Pollard_T2802_Orion_DevGeneral Fix assert in channel cleanup code that could occur if the connection was cleaned up, and there were KeepProcessingActorChannelBunchesMap in-flight still #rb RyanG #tests Replays Change 3044696 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Added additional checks to ResavePackagesCommandlet so people don't miss the required allowcommandletrendering flag when using buildlighting option. #test rebuild lighting using resave packages paragon #rb None Change 3044690 on 2016/07/11 by Daniel.Lamb@daniel.lamb_T3905_6612 Changed MBWritten cooker stats to report mb instead of bytes... #rb Wes.Hunt. #test cook paragon. Change 3044439 on 2016/07/11 by Jason.Bestimt@Robomerge_Orion_DevGeneral #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3043960 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3044428 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) [CL 3070724 by Andrew Grant in Main branch]
2016-07-29 17:10:25 -04:00
// Loop through all the lines of the output. Even though we requested one result, we'll get one for each search pattern.
int CL = 0;
foreach(string Line in P4Result.Output.Split('\n'))
{
string[] Tokens = Line.Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
if(Tokens.Length >= 2)
{
int LineCL = Int32.Parse(Tokens[1]);
CL = Math.Max(CL, LineCL);
}
}
return CL.ToString();
}
/// <summary>
/// Detects root paths for the specified client.
/// </summary>
/// <param name="UATLocation">AutomationTool.exe location</param>
/// <param name="ThisClient">Client to detect the root paths for</param>
/// <param name="BuildRootPath">Build root</param>
/// <param name="LocalRootPath">Local root</param>
/// <param name="ClientRootPath">Client root</param>
private static void DetectRootPaths(P4Connection Connection, string LocalRootPath, P4ClientInfo ThisClient, out string BuildRootPath, out string ClientRootPath)
{
if(!String.IsNullOrEmpty(ThisClient.Stream))
{
BuildRootPath = ThisClient.Stream;
ClientRootPath = String.Format("//{0}", ThisClient.Name);
}
else
{
// Figure out the build root
string KnownFilePathFromRoot = CommandEnvironment.KnownFileRelativeToRoot;
string KnownLocalPath = CommandUtils.MakePathSafeToUseWithCommandLine(CommandUtils.CombinePaths(PathSeparator.Slash, LocalRootPath, KnownFilePathFromRoot));
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3120366) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 2714591 on 2015/10/02 by Ben.Marsh Initial branch of files from Engine-Main (//UE4/Engine-Main) to Dev-Platform (//UE4/Dev-Platform) Change 2916715 on 2016/03/21 by Daniel.Lamb First pass at splitting out build cook run into into seperate scripts. Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3059693 on 2016/07/21 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3061151 on 2016/07/22 by Niklas.Smedberg Fast ASTC texture compression, using ISPC. #jira UE-32308 Change 3061428 on 2016/07/22 by Peter.Sauerbrei Back out changelist 3061151 as it wasn't approved for submission Change 3061970 on 2016/07/22 by Steve.Cano Adding AdMob interstitital ad support for Android, including Blueprint functions #jira UE-33286 #ue4 #android Change 3062160 on 2016/07/22 by Mark.Satterthwaite Fix the fix for handling RHISetStreamSource overriding stride on Metal - not all MTLVertexDescriptors are equally hashable so do this ourselves. #jira UE-33355 Change 3062770 on 2016/07/24 by Brent.Pease UE-32397 Error Message displays as Unknown Error when failing to supply a Remote Build server for ios on Windows Change 3063227 on 2016/07/25 by Dmitry.Rekman Update hlslcc cross-compile after libc++ change. Change 3063314 on 2016/07/25 by Jeff.Campeau Xbox One DLL loading Receipts can be read back by request for target info Change 3063329 on 2016/07/25 by Mark.Satterthwaite CL #3046743 was breaking other samples in unexpected ways after a recent Main merge, so make a Metal-specific change to the shader instead and amend the MetalBackend to better match HLSL's handling of NaN/inf with common single-precision float intrinsics. This is sufficient to fix the AtmosphericFog and the recent regressions. #jira UE-33600 #jira UE-33028 #jira UE-27879 #jira UE-25802 Change 3063492 on 2016/07/25 by Brent.Pease UE-23846 - iOS Movie Player can't handle videos at resolutions that aren't multiples of 16 UE-33200 - A movie isn't played on iOS occasionally. Change 3063729 on 2016/07/25 by Dmitry.Rekman Linux: enable XGE on all platforms. #tests Cross-compiled a number of Linux targets on Windows. Change 3063732 on 2016/07/25 by Dmitry.Rekman Fixed formatting (spaces->tabs) in previous change. Change 3063750 on 2016/07/25 by Daniel.Lamb Added code to dump the cook modification delegate loads to log. Fixed the memory usage output log. #test cook paragon. Change 3063804 on 2016/07/25 by Daniel.Lamb Added cookpartialgc additional commandline option to uat. #test UFE Change 3064008 on 2016/07/25 by Mark.Satterthwaite For non-shipping builds conditionally bind a default uniform buffer in Metal and report an error if the slot was unbound, if our validation layer is enabled attempt to report the shader source in question. This relies on the shader compiler providing accurate information about uniform buffer bindings and won't fix all occurances of bad uniform usage (if a buffer is bound but too short the result will be GPU restarts or an error in Apple's validation layer - we can't detect this case) but will help debug the typical error of leaving an active slot unbound. #jira FORT-27685 Change 3064141 on 2016/07/25 by Jeff.Campeau Rebuild vpxmd.lib with delayed codegen disabled (fixes linker warning building Win64). Change 3065024 on 2016/07/26 by Nick.Shin Change filetype remove exclusive check out bit requested by or.coheni & nick.penwarden Change 3065274 on 2016/07/26 by Jonathan.Fitzpatrick DirectoriesToAlwaysStageAsUFS now properly filters out *.uasset and *.umap files This prevents the bug where cooked assets get trampled by staging their uncooked version on top of them during the UFS step Added a file filter to DirectoriesToAlwaysStageAsUFS for uasset and umap. Change 3066338 on 2016/07/27 by Mark.Satterthwaite Handle releasing an SRV/UAV & the source object within a single Metal command-buffer. #jira UE-33779 Change 3066789 on 2016/07/27 by Daniel.Lamb Realtime mode does not save any packages anymore unless they are ready. #test cookontheside, cookbythebook shooter game Change 3066847 on 2016/07/27 by Jeff.Campeau Fix define #2634 #jira UE-33813 Change 3068868 on 2016/07/28 by Mark.Satterthwaite Extend hlslcc's handling of switch-statements to allow implict casts from scalar bool, half & float as HLSL itself permits while also making sure it errors if the expression input is not scalar. This fixes shader compile errors in UT. Change 3070040 on 2016/07/29 by Dmitry.Rekman Delete Nadzorca. Change 3070947 on 2016/07/29 by Jeff.Campeau Perforce C++ API 2015.2 (includes debug libraries) Change 3073707 on 2016/08/02 by Daniel.Lamb Derived data cache commandlet runs resolve string asset references to load any string asset refereced packages from the map. Also process async results from shaders being compiled so they can have their memory resources released. #test DerivedDataCache commandlet shootergame. Change 3076613 on 2016/08/03 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3076668 on 2016/08/03 by Brent.Pease Back out changelist 3076613 Change 3077157 on 2016/08/04 by Daniel.Lamb Fixed up DLC staging so that it stages to the proper mount point. Fixes up include engine content in DLC staging paths. #test Made up shooter game DLC Change 3077191 on 2016/08/04 by Daniel.Lamb More smartly process async shader compilation if we are waiting for it. #test cook on the side shooter game cook by the book shooter game. Change 3077412 on 2016/08/04 by Mark.Satterthwaite Fix "iOS Metal-based build crashes at launch with sub-levels": - Slate should not bind the null RHI texture from an unitialised texture atlas - atlases only have a valid texture pointer once an entry has been added to them and in the template projects an empty sub-level doesn't add anything. - To prevent this kind of bug resurfacing and being so hard to track down add Metal shader binding validation to our validation layer as Apple's is incomplete on iOS and won't warn us about nil texture usage which causes these GPU restarts. This requires reworking our vertex declaration handling to be more efficient so that we can cache the pipeline reflection data as well as the pipeline objects. - Fix validation error of texture reallocation on loading template projects under Metal. #jira UE-30847 Change 3077958 on 2016/08/04 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3079503 on 2016/08/05 by Mark.Satterthwaite Initialise more variable types to 0 in Metal shaders to workaround Xcode 8 toolchain no longer doing this for us for "threadgroup shared" variables. Everything but structs and atomic's will now be initialised. #jira UE-33856 Change 3079737 on 2016/08/05 by Jeff.Campeau Add support for delay load DLLs on Xbox One Turn off warnging for missing PDBs to match VCToolchain.cs Change 3081005 on 2016/08/08 by Mark.Satterthwaite Fix-up Metal device name on AMD for macOS 10.12 which reports it correctly and enable tiled reflections on Intel from macOS 10.12 too as they now work. Change 3081557 on 2016/08/08 by Daniel.Lamb File-> Package saves all packages before starting packaging. #test File package first person template Change 3082215 on 2016/08/09 by Lee.Clark PS4 - Added 4k profile Change 3082412 on 2016/08/09 by Daniel.Lamb Fixed cook on the fly server not handling cook requests. #test Cook on the fly shooter game. Change 3082955 on 2016/08/09 by Dmitry.Rekman Linux: convert existing Strcat() uses to Strncat(). - Strcat() does not check destination size so can silently corrupt memory. While this was not observed, this conversion removes this concern altogether. Change 3083772 on 2016/08/10 by Luke.Thatcher [PLATFORM] [PS4] [+] Checking in PS4CrashHandler files so we have a copy in Perforce rather than just on the server. - Taken from \\devweb-02 and removed all the unused files/dependencies. - Created a publish profile pointing to \\devweb-02\Sites\PS4Services\PS4CrashHandlerDev so I'm not writing over the existing deployed crash handler. - Moved all code in the Page_Load event to inside the check for the HTTP method (POST) otherwise GET'ing the page from a browser will generate crash folders that hang around forever. Change 3085450 on 2016/08/11 by Lee.Clark PS4 - Fix mediaplayer pipeline allocation Change 3086360 on 2016/08/11 by Michael.Trepka Fixed a non-unity build error in Mac UnrealFrontend Change 3087224 on 2016/08/12 by Luke.Thatcher [PLATFORM] [PS4] [~] Refactor PS4 Crash Handler site - Removed CoreDumpHandler. Processing dump files is handled directly by an async thread within the aspx process. - Separated configuration values into their own class. Currently set to output to a testing directory, rather than the actual crash reporter landing zone. - Added a debug upload page to allow manual submission of .orbisdmp/.txt settings files, accessible by GET'ing Default.aspx. - Added logging. Logs self-delete after 30 days. Testing required before we switch to the new system. #jira UE-34504 #jira OR-26886 Change 3087626 on 2016/08/12 by Dmitry.Rekman PR #2689: Fix copying/duplicating failing on Linux (UE-34586). - Contributed by Web-eWorks. Change 3087991 on 2016/08/12 by Mark.Satterthwaite Initial AVFoundation implementation of Media Framework for Mac, iOS & tvOS. - Video playback occurs via AVPlayerItemVideoOutput's attached to the AVPlayerItem's output. This means gathering video samples is trivial. - Metal texture updates occur by wrapping the texture object provided by AVF - for Mac this is simple as it can bind to the IOSurface directly, for iOS/tvOS we have to create a CVMetalTextureCache and allocate our texture from there. - OpenGL and OpenGLES currently have to lock the pixel buffer and upload to a texture the old fashioned way - this should be revisited when there is time. - Subtitles/Captions are captured using AVPlayerItemLegibleOutput which also connects to the AVPlayerItem's output. - On Mac audio samples are returned by manually reading from the stream using an AVAssetReaderTrackOutput, including manual seeking and synching. - On iOS/tvOS the audio is played directly by AVPlayer because the IOSAudio system can't handle procedural buffers - otherwise it could reuse the Mac code. - AVFoundation does not support AVI - that's an obsolete Microsoft/Windows file-format. - Only 'file://' URLs are supported - streaming would require a totally different audio solution (using MTAudioProcessingTap) and has many more edge and failure cases that would need to be handled. #jira UE-34315 Change 3088790 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [~] Hook new PS4 crash handler up to the crash reporter website. - Removed indentation from generated crash context XML file. The crash reporter process does manual XML parsing which doesn't correctly handle whitespace at the start of lines. - Switched the final output folder to match the one the crash reporter process is watching. - Hide upload form on a config variable. #jira UE-34504 #jira OR-26886 Change 3089060 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [!] Change PS4 crash handler log file extension to ".ps4chlog", otherwise the crash reporter site attaches the wrong log file to the crash report. Allowed showing of debug upload form via "Default.aspx?showform=1" query string. #jira UE-34504 #jira OR-26886 Change 3089089 on 2016/08/15 by Mark.Satterthwaite Duplicated changes to AppleMovieStreamer from CL #3088149. #jira UE-34315 Change 3089460 on 2016/08/15 by Mark.Satterthwaite Duplicate CL #3080971: Workaround a macOS 10.12 Beta bug on some Metal drivers that can't initialise temporary/local variable arrays, only those that are marked threadgroup shared. #jira UE-34355 Change 3089465 on 2016/08/15 by Mark.Satterthwaite For Metal shader translation retain more precision for float constants -1.0f >< 1.0f by emitting them in scientific notation - prevents Hammersley constant amongst others from being flushed to 0. Change 3089902 on 2016/08/15 by Daniel.Lamb Changed the next compiling ID to the correct compiling ID. #test Cook Change 3089903 on 2016/08/15 by Daniel.Lamb Cooker monitors config useage during cook and uses those settings to invalidate cooked content instead of all config settings. Change 3090114 on 2016/08/16 by Luke.Thatcher [PLATFORM] [PS4] [~] Minor change to PS4 settings text on crash handler site. Change 3090949 on 2016/08/16 by Nick.Shin WebSocketNetDriver crash fix filled in missing chunk of code that calls PacketHandler's "packet modifiers" #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket #code.review john.pollard john.barrett Change 3091265 on 2016/08/16 by Brent.Pease Add IOS support to HarfBuzz Change 3091267 on 2016/08/16 by Brent.Pease Add references to fix mono build Change 3091291 on 2016/08/16 by Nick.Shin CIS warning fix #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket Change 3091781 on 2016/08/17 by Joe.Barnes UE-33640: Exposed UPrimitiveComponent::IsAnyRigidBodyAwake() to Blueprints. Change 3092687 on 2016/08/17 by Daniel.Lamb Added support for using binned allocator in cooker instead of tbb. #test Cook shootergame. Change 3093867 on 2016/08/18 by Mark.Satterthwaite Use a read/write mutex to protect access to Metal's internal shader pipeline caches so that parallel threads can progress in the common case where new shaders are not being compiled. Change 3093950 on 2016/08/18 by Mark.Satterthwaite Change the Mac GPU identification code to cope with AMD's new naming scheme on 10.12. Change 3093951 on 2016/08/18 by Mark.Satterthwaite More SCW threads on Mac - they work now. Change 3093960 on 2016/08/18 by Mark.Satterthwaite Increase the default number of command-buffers on Mac because bigger games overflow the current limit of 64 per queue. Change 3096493 on 2016/08/22 by Jeff.Campeau Use Xbox version of DirectX include. Change 3097509 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor PS4 Symbol Publish - Moved the SymStore task from Win.Automation to BuildGraph.Automation, and made it more generic. - The specifics of uploading symbols are now implemented in the platform tool chain, alongside StripSymbols(). - Re-generated the build graph schema file. - Removed the old PS4 symbols upload path in the package step. Modified OrionBuild.xml to publish symbols for all PS4 dev, test and shipping config builds of OrionClient. Change 3097635 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor Age Symbols task in UAT. - Moved the AgeStore task from Win.Automation to BuildGraph.Automation and made it more generic. - Symbol server directory structure is now defined by the platform tool chain, which the common task uses to clean out old symbols. - Added a "filter" parameter to prevent age tasks deleting symbols from unrelated builds in shared symbol servers. Modified OrionBuild.xml to age both the Windows and PS4 symbol stores. Change 3097713 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Enable new PS4 crash handler server - Created live deployment profile and applied the required config file changes. Change 3099214 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix compile error in PS4 tool chain. For some reason, this only breaks ocassionally. Maybe we're alternating between the 2013 and 2015 C# compilers depending on what initiates the build (e.g. Visual Studio vs GenerateProjectFiles)? Change 3099222 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [+] Added PS4 support for FPlatformMisc::MessageBoxExt using the MsgDialog library. - Note, only one and two button message dialogs are supported (limitation of MsgDialog). Change 3099260 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [~] Better PS4 exit function. Calls quick_exit instead of abort when we've not asserted. Allows for a "cleaner" forced exit without generating a crash dump. Change 3101192 on 2016/08/25 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3101944 on 2016/08/25 by Daniel.Lamb Ask to save the current level when we are using launch on. Change 3102036 on 2016/08/25 by Nick.Shin check for minimum expected size upon data received from network #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 3102115 on 2016/08/25 by Brent.Pease - Fix small errors that probably only show up in the mac mono build #code.review peter.sauerbrei Change 3102747 on 2016/08/26 by Jeremiah.Waldron Re-submitting OnlineSubsystemGameCircle with TPS permission for Amazon SDK - Also fixed the plugin to remove any related files from the final package when IAP is disabled or GameCircle support itself is disabled with the plugin still enabled - Added support for new AlreadyOwned IAP response code as well which is already used for GooglePlay and IOS Change 3102900 on 2016/08/26 by Nick.Shin since last checkin (CL: 2981945) - prints are crashing the browser - this change will allow browser to print the details via console.log() #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 3103130 on 2016/08/26 by Brent.Pease UE-24679 - Enable the ability to change ports for a firewall to pass them through rsync Change 3103225 on 2016/08/26 by Daniel.Lamb Fixed issue with warning which would cause crash. Change 3103425 on 2016/08/26 by Dmitry.Rekman Enable offscreen GL rendering without X. - Added new video subsystem to SDL that is uses EGL to initialize the context. - Most windoing functions stubbed. - Also added a new test case to TestPAL for easier debugging. Change 3104743 on 2016/08/29 by Brent.Pease Support remote offline metal shader compilation Change 3105051 on 2016/08/29 by Brent.Pease UE-2382 - TASK: MobleMVP: iOS: Add ability to view iOS device console output in the editor UFE - IOS Automation will now create a thread to collect the console logs from the device and send them to C# Console output while the app is running on device - Made ProcessResult an interface (IProcessResult) which ProcessResult implements. This allows platforms to provide their own implementation if needed. - Moved the RunLoop related parts of CoreFoundation into MobileDevice.cs Change 3105053 on 2016/08/29 by Brent.Pease - IOS dll's as part of the last check-in Change 3106853 on 2016/08/30 by Jeff.Campeau Implement FD3D11DynamicRHI::RHICreateComputeFence to prevent memory overwrite Change 3107361 on 2016/08/30 by Dmitry.Rekman Renderer: changes to allow postproc delegates. Change 3107362 on 2016/08/30 by Dmitry.Rekman Plugin with a CUDA postproc example. - Linux version only. Runs under a headless GL too (without X). - Disabled during cross-compilation, can be compiled natively only. - CUDA kernel should be compiled separately, CMakefile with compilation attached (can be used to generate VStudio projects as well). - To test the output, run under the debugger, interrupt and set global variable GSaveTheOutput to 50 (this will write out kernel output buffer 50 times as .bmp files into working directory). Change 3107913 on 2016/08/31 by Daniel.Lamb Fixed loading of cooked content in the editor. Change 3107916 on 2016/08/31 by Daniel.Lamb Added error case when shader compilation fails to notify shader. #test Cook shooter game. Change 3108080 on 2016/08/31 by Josh.Adams - Fixed PS4Automation compile errors Change 3109077 on 2016/08/31 by Brent.Pease Fix C# debug builds by specifying x64 and add reference to MobileDeviceInterface Change 3110086 on 2016/09/01 by Dmitry.Rekman Fix race condition in PThread runnable (UE-35074). - Instead of relying on busy-wait, join the threads. This prevents race between PostRun() (executed in the context of the thread) and FPThreadRunnableThread() destructor (see UE-34909). - Do not use an invalid value for pthread_t, since there's none. Change 3110172 on 2016/09/01 by Dmitry.Rekman Fixed a crash exiting VR Preview on Windows GL4 (UE-28708). - PR #2188 submitted by ardneran. Change 3110313 on 2016/09/01 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3111134 on 2016/09/01 by Dmitry.Rekman UBT: prevent mono from hanging on Ctrl-C. - Sometimes Ctrl-C can cause thread creation to fail. Without this change, UBT would lock up. Change 3111171 on 2016/09/01 by Brent.Pease Move all C# projects to use the x64 Platform for consistency with other changes made to move to the x64 Platform Change 3111177 on 2016/09/01 by Dmitry.Rekman Fix Linux build on systems without CUDA (UE-35460). Change 3111548 on 2016/09/02 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix for PS4 iterative deployment. - Changes in Dev-Mobile broke the deployment manifests, as PS4 was now using the wrong filename when creating delta and obsolete file lists. Change 3111863 on 2016/09/02 by Dmitry.Rekman Better fix for build without CUDA (UE-35460). Change 3112738 on 2016/09/02 by Mark.Satterthwaite Fix the pausing particles on Metal - one line bug in the Metal query implementation meant that the first query wouldn't return the correct result for no good reason. #jira UE-34989 Change 3114579 on 2016/09/06 by Chris.Babcock Fix Vulkan include path in NDK check (contributed by geediiiiky) #jira UE-35490 #github #2758 #ue4 #android Change 3115115 on 2016/09/06 by Jeff.Campeau Calculate buffer size for paks using the bitwindow override as needed Change 3115600 on 2016/09/07 by Luke.Thatcher [PLATFORM] [PS4] [~] Make the crash dump handler registration much earlier, to catch crashes in early engine init. - Fixed up places in FGenericCrashContext::SerializeContentToBuffer which used the command line. If we crash early, the command line may not have been initialized yet. - Added a GetNoInit function to FThreadHeartBeat to avoid creating the heart beat thread if we crash early, and the thread doesn't exist yet. Tested by calling abort() immediately inside int main(), and we get a valid crash dump that the crash handler service can consume. Change 3115676 on 2016/09/07 by Luke.Thatcher [PLATFORM] [~] Dev-Platform integration fix for original CL 3064888 in //Orion/Release-29.1 Add .exe and .dll to windows symbol upload file filters. Change 3115811 on 2016/09/07 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3115944 on 2016/09/07 by Michael.Trepka Implemented IsGamepadAttached() for Mac Change 3115948 on 2016/09/07 by Michael.Trepka Don't try to restore Help menu item on Mac if MenuBlock does not contain it Change 3116200 on 2016/09/07 by Jeff.Campeau Fix parameter ordering Change 3117660 on 2016/09/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3117728 on 2016/09/08 by Michael.Trepka Copy of CL 3117698 by Mike.Fricker Fixed regression with editor's Simulate mode where cursor would teleport back to the center of the viewport after every click - This bug was introduced in CL 3075932 from a borderless window cursor handling fix that was needed for games that capture the cursor Change 3117797 on 2016/09/08 by Peter.Sauerbrei Shader Resource compression Change 3117988 on 2016/09/08 by Brent.Pease - Solutiion generator will now pick x64 instead of AnyCPU for the default platform configuration - Fix what I think was a merge error in BuildGraph.cs Change 3118296 on 2016/09/08 by Daniel.Lamb Fixed crash with launch on. Couldnt' correctly detect previous generated ini settings. #test launch on QA game #jira UE-35741 Change 3118438 on 2016/09/08 by JohnHenry.Carawon Fix UAT compilation on Linux #UE-35745 Change 3118934 on 2016/09/08 by Jeff.Campeau Shader compression setting based on target platform instead of cooking host platform. #jira UE-35753 Change 3120190 on 2016/09/09 by Ben.Marsh Add missing Platform attribute to build script for Dev-Platform. [CL 3120378 by Josh Adams in Main branch]
2016-09-09 20:13:41 -04:00
IProcessResult P4Result = Connection.P4(String.Format("files -m 1 {0}", KnownLocalPath), AllowSpew: false);
string KnownFileDepotMapping = P4Result.Output;
// Get the build root
Log.TraceVerbose("Looking for {0} in {1}", KnownFilePathFromRoot, KnownFileDepotMapping);
int EndIdx = KnownFileDepotMapping.IndexOf(KnownFilePathFromRoot, StringComparison.CurrentCultureIgnoreCase);
if (EndIdx < 0)
{
EndIdx = KnownFileDepotMapping.IndexOf(CommandUtils.ConvertSeparators(PathSeparator.Slash, KnownFilePathFromRoot), StringComparison.CurrentCultureIgnoreCase);
}
// Get the root path without the trailing path separator
BuildRootPath = KnownFileDepotMapping.Substring(0, EndIdx - 1);
// Get the client root
if (LocalRootPath.StartsWith(CommandUtils.CombinePaths(PathSeparator.Slash, ThisClient.RootPath, "/"), StringComparison.InvariantCultureIgnoreCase) || LocalRootPath == CommandUtils.CombinePaths(PathSeparator.Slash, ThisClient.RootPath))
{
ClientRootPath = CommandUtils.CombinePaths(PathSeparator.Depot, String.Format("//{0}/", ThisClient.Name), LocalRootPath.Substring(ThisClient.RootPath.Length));
}
else
{
throw new AutomationException("LocalRootPath ({0}) does not start with the client root path ({1})", LocalRootPath, ThisClient.RootPath);
}
}
}
/// <summary>
/// Detects a workspace given the current user name, host name and depot path.
/// </summary>
/// <param name="UserName">User name</param>
/// <param name="HostName">Host</param>
/// <param name="UATLocation">Path to UAT exe, this will be checked agains the root path.</param>
/// <returns>Client to use.</returns>
private static P4ClientInfo DetectClient(P4Connection Connection, string UserName, string HostName, string UATLocation)
{
CommandUtils.LogVerbose("uebp_CLIENT not set, detecting current client...");
var MatchingClients = new List<P4ClientInfo>();
P4ClientInfo[] P4Clients = Connection.GetClientsForUser(UserName, UATLocation);
foreach (var Client in P4Clients)
{
if (!String.IsNullOrEmpty(Client.Host) && String.Compare(Client.Host, HostName, true) != 0)
{
Log.TraceInformation("Rejecting client because of different Host {0} \"{1}\" != \"{2}\"", Client.Name, Client.Host, HostName);
continue;
}
MatchingClients.Add(Client);
}
P4ClientInfo ClientToUse = null;
if (MatchingClients.Count == 0)
{
throw new AutomationException("No matching clientspecs found!");
}
else if (MatchingClients.Count == 1)
{
ClientToUse = MatchingClients[0];
}
else
{
// We may have empty host clients here, so pick the first non-empty one if possible
foreach (var Client in MatchingClients)
{
if (!String.IsNullOrEmpty(Client.Host) && String.Compare(Client.Host, HostName, true) == 0)
{
ClientToUse = Client;
break;
}
}
if (ClientToUse == null)
{
Log.TraceWarning("{0} clients found that match the current host and root path. The most recently accessed client will be used.", MatchingClients.Count);
ClientToUse = GetMostRecentClient(MatchingClients);
}
}
return ClientToUse;
}
/// <summary>
/// Given a list of clients with the same owner and root path, tries to find the most recently accessed one.
/// </summary>
/// <param name="Clients">List of clients with the same owner and path.</param>
/// <returns>The most recent client from the list.</returns>
private static P4ClientInfo GetMostRecentClient(List<P4ClientInfo> Clients)
{
Log.TraceVerbose("Detecting the most recent client.");
P4ClientInfo MostRecentClient = null;
var MostRecentAccessTime = DateTime.MinValue;
foreach (var ClientInfo in Clients)
{
if (ClientInfo.Access.Ticks > MostRecentAccessTime.Ticks)
{
MostRecentAccessTime = ClientInfo.Access;
MostRecentClient = ClientInfo;
}
}
if (MostRecentClient == null)
{
throw new AutomationException("Failed to determine the most recent client in {0}", Clients[0].RootPath);
}
return MostRecentClient;
}
/// <summary>
/// Detects current user name.
/// </summary>
/// <returns></returns>
private static string DetectUserName(P4Connection Connection)
{
var UserName = String.Empty;
var P4Result = Connection.P4("info", AllowSpew: false);
if (P4Result.ExitCode != 0)
{
throw new AutomationException("Perforce command failed: {0}. Please make sure your P4PORT or {1} is set properly.", P4Result.Output, EnvVarNames.P4Port);
}
// Retrieve the P4 user name
var Tags = Connection.ParseTaggedP4Output(P4Result.Output);
Tags.TryGetValue("User name", out UserName);
if (String.IsNullOrEmpty(UserName))
{
UserName = Environment.GetEnvironmentVariable(EnvVarNames.User);
if (!String.IsNullOrEmpty(UserName))
{
Log.TraceWarning("Unable to retrieve perforce user name. Trying to fall back to {0} which is set to {1}.", EnvVarNames.User, UserName);
}
else
{
throw new AutomationException("Failed to retrieve user name.");
}
}
Environment.SetEnvironmentVariable("P4USER", UserName);
return UserName;
}
/// <summary>
/// Attempts to detect source control server address from environment variables.
/// </summary>
/// <returns>Source control server address.</returns>
private static string DetectP4Port()
{
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140) ========================== MAJOR FEATURES + CHANGES ========================== Change 2959679 on 2016/04/28 by Ben.Marsh UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag. Change 2959695 on 2016/04/28 by Ben.Marsh UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter". Change 2960798 on 2016/04/29 by Ben.Marsh Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT. Change 2960928 on 2016/04/29 by Ben.Marsh UGS: Change filter for buildmachine changes to only include rebuilt lightmaps. Change 2963214 on 2016/05/02 by Ben.Marsh BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running. Change 2964454 on 2016/05/03 by Ben.Marsh Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing. Change 2964533 on 2016/05/03 by Ben.Marsh BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS. Change 2964852 on 2016/05/03 by Ben.Marsh BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so. Change 2966856 on 2016/05/04 by Ben.Marsh EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc... Change 2966867 on 2016/05/04 by Ben.Marsh EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval. Change 2967504 on 2016/05/05 by Ben.Marsh UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription. Change 2967778 on 2016/05/05 by Ben.Marsh UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG. Change 2967815 on 2016/05/05 by Ben.Marsh EC: Copy the initial resource pool setting from the stream settings into an EC property Change 2967873 on 2016/05/05 by Ben.Marsh EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet. Change 2969294 on 2016/05/06 by Ben.Marsh EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments. Change 2969371 on 2016/05/06 by Ben.Marsh EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams. Change 2970623 on 2016/05/09 by Ben.Marsh UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered. Change 2970627 on 2016/05/09 by Ben.Marsh UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants. Change 2972140 on 2016/05/10 by Ben.Marsh Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger. #lockdown Nick.Penwarden [CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
string P4PortEnv = Environment.GetEnvironmentVariable("P4PORT");
if(String.IsNullOrEmpty(P4PortEnv))
{
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140) ========================== MAJOR FEATURES + CHANGES ========================== Change 2959679 on 2016/04/28 by Ben.Marsh UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag. Change 2959695 on 2016/04/28 by Ben.Marsh UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter". Change 2960798 on 2016/04/29 by Ben.Marsh Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT. Change 2960928 on 2016/04/29 by Ben.Marsh UGS: Change filter for buildmachine changes to only include rebuilt lightmaps. Change 2963214 on 2016/05/02 by Ben.Marsh BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running. Change 2964454 on 2016/05/03 by Ben.Marsh Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing. Change 2964533 on 2016/05/03 by Ben.Marsh BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS. Change 2964852 on 2016/05/03 by Ben.Marsh BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so. Change 2966856 on 2016/05/04 by Ben.Marsh EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc... Change 2966867 on 2016/05/04 by Ben.Marsh EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval. Change 2967504 on 2016/05/05 by Ben.Marsh UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription. Change 2967778 on 2016/05/05 by Ben.Marsh UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG. Change 2967815 on 2016/05/05 by Ben.Marsh EC: Copy the initial resource pool setting from the stream settings into an EC property Change 2967873 on 2016/05/05 by Ben.Marsh EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet. Change 2969294 on 2016/05/06 by Ben.Marsh EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments. Change 2969371 on 2016/05/06 by Ben.Marsh EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams. Change 2970623 on 2016/05/09 by Ben.Marsh UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered. Change 2970627 on 2016/05/09 by Ben.Marsh UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants. Change 2972140 on 2016/05/10 by Ben.Marsh Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger. #lockdown Nick.Penwarden [CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
// If it's not set, spawn Perforce to get the current server port setting
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3120366) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 2714591 on 2015/10/02 by Ben.Marsh Initial branch of files from Engine-Main (//UE4/Engine-Main) to Dev-Platform (//UE4/Dev-Platform) Change 2916715 on 2016/03/21 by Daniel.Lamb First pass at splitting out build cook run into into seperate scripts. Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3059693 on 2016/07/21 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3061151 on 2016/07/22 by Niklas.Smedberg Fast ASTC texture compression, using ISPC. #jira UE-32308 Change 3061428 on 2016/07/22 by Peter.Sauerbrei Back out changelist 3061151 as it wasn't approved for submission Change 3061970 on 2016/07/22 by Steve.Cano Adding AdMob interstitital ad support for Android, including Blueprint functions #jira UE-33286 #ue4 #android Change 3062160 on 2016/07/22 by Mark.Satterthwaite Fix the fix for handling RHISetStreamSource overriding stride on Metal - not all MTLVertexDescriptors are equally hashable so do this ourselves. #jira UE-33355 Change 3062770 on 2016/07/24 by Brent.Pease UE-32397 Error Message displays as Unknown Error when failing to supply a Remote Build server for ios on Windows Change 3063227 on 2016/07/25 by Dmitry.Rekman Update hlslcc cross-compile after libc++ change. Change 3063314 on 2016/07/25 by Jeff.Campeau Xbox One DLL loading Receipts can be read back by request for target info Change 3063329 on 2016/07/25 by Mark.Satterthwaite CL #3046743 was breaking other samples in unexpected ways after a recent Main merge, so make a Metal-specific change to the shader instead and amend the MetalBackend to better match HLSL's handling of NaN/inf with common single-precision float intrinsics. This is sufficient to fix the AtmosphericFog and the recent regressions. #jira UE-33600 #jira UE-33028 #jira UE-27879 #jira UE-25802 Change 3063492 on 2016/07/25 by Brent.Pease UE-23846 - iOS Movie Player can't handle videos at resolutions that aren't multiples of 16 UE-33200 - A movie isn't played on iOS occasionally. Change 3063729 on 2016/07/25 by Dmitry.Rekman Linux: enable XGE on all platforms. #tests Cross-compiled a number of Linux targets on Windows. Change 3063732 on 2016/07/25 by Dmitry.Rekman Fixed formatting (spaces->tabs) in previous change. Change 3063750 on 2016/07/25 by Daniel.Lamb Added code to dump the cook modification delegate loads to log. Fixed the memory usage output log. #test cook paragon. Change 3063804 on 2016/07/25 by Daniel.Lamb Added cookpartialgc additional commandline option to uat. #test UFE Change 3064008 on 2016/07/25 by Mark.Satterthwaite For non-shipping builds conditionally bind a default uniform buffer in Metal and report an error if the slot was unbound, if our validation layer is enabled attempt to report the shader source in question. This relies on the shader compiler providing accurate information about uniform buffer bindings and won't fix all occurances of bad uniform usage (if a buffer is bound but too short the result will be GPU restarts or an error in Apple's validation layer - we can't detect this case) but will help debug the typical error of leaving an active slot unbound. #jira FORT-27685 Change 3064141 on 2016/07/25 by Jeff.Campeau Rebuild vpxmd.lib with delayed codegen disabled (fixes linker warning building Win64). Change 3065024 on 2016/07/26 by Nick.Shin Change filetype remove exclusive check out bit requested by or.coheni & nick.penwarden Change 3065274 on 2016/07/26 by Jonathan.Fitzpatrick DirectoriesToAlwaysStageAsUFS now properly filters out *.uasset and *.umap files This prevents the bug where cooked assets get trampled by staging their uncooked version on top of them during the UFS step Added a file filter to DirectoriesToAlwaysStageAsUFS for uasset and umap. Change 3066338 on 2016/07/27 by Mark.Satterthwaite Handle releasing an SRV/UAV & the source object within a single Metal command-buffer. #jira UE-33779 Change 3066789 on 2016/07/27 by Daniel.Lamb Realtime mode does not save any packages anymore unless they are ready. #test cookontheside, cookbythebook shooter game Change 3066847 on 2016/07/27 by Jeff.Campeau Fix define #2634 #jira UE-33813 Change 3068868 on 2016/07/28 by Mark.Satterthwaite Extend hlslcc's handling of switch-statements to allow implict casts from scalar bool, half & float as HLSL itself permits while also making sure it errors if the expression input is not scalar. This fixes shader compile errors in UT. Change 3070040 on 2016/07/29 by Dmitry.Rekman Delete Nadzorca. Change 3070947 on 2016/07/29 by Jeff.Campeau Perforce C++ API 2015.2 (includes debug libraries) Change 3073707 on 2016/08/02 by Daniel.Lamb Derived data cache commandlet runs resolve string asset references to load any string asset refereced packages from the map. Also process async results from shaders being compiled so they can have their memory resources released. #test DerivedDataCache commandlet shootergame. Change 3076613 on 2016/08/03 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3076668 on 2016/08/03 by Brent.Pease Back out changelist 3076613 Change 3077157 on 2016/08/04 by Daniel.Lamb Fixed up DLC staging so that it stages to the proper mount point. Fixes up include engine content in DLC staging paths. #test Made up shooter game DLC Change 3077191 on 2016/08/04 by Daniel.Lamb More smartly process async shader compilation if we are waiting for it. #test cook on the side shooter game cook by the book shooter game. Change 3077412 on 2016/08/04 by Mark.Satterthwaite Fix "iOS Metal-based build crashes at launch with sub-levels": - Slate should not bind the null RHI texture from an unitialised texture atlas - atlases only have a valid texture pointer once an entry has been added to them and in the template projects an empty sub-level doesn't add anything. - To prevent this kind of bug resurfacing and being so hard to track down add Metal shader binding validation to our validation layer as Apple's is incomplete on iOS and won't warn us about nil texture usage which causes these GPU restarts. This requires reworking our vertex declaration handling to be more efficient so that we can cache the pipeline reflection data as well as the pipeline objects. - Fix validation error of texture reallocation on loading template projects under Metal. #jira UE-30847 Change 3077958 on 2016/08/04 by Brent.Pease + UnrealTargetConfiguration is now passed into deploy and package methods + The UIRequiredDeviceCapabilities plist key now only considers the architectures from the corresponding target configuration (shipping or development) Change 3079503 on 2016/08/05 by Mark.Satterthwaite Initialise more variable types to 0 in Metal shaders to workaround Xcode 8 toolchain no longer doing this for us for "threadgroup shared" variables. Everything but structs and atomic's will now be initialised. #jira UE-33856 Change 3079737 on 2016/08/05 by Jeff.Campeau Add support for delay load DLLs on Xbox One Turn off warnging for missing PDBs to match VCToolchain.cs Change 3081005 on 2016/08/08 by Mark.Satterthwaite Fix-up Metal device name on AMD for macOS 10.12 which reports it correctly and enable tiled reflections on Intel from macOS 10.12 too as they now work. Change 3081557 on 2016/08/08 by Daniel.Lamb File-> Package saves all packages before starting packaging. #test File package first person template Change 3082215 on 2016/08/09 by Lee.Clark PS4 - Added 4k profile Change 3082412 on 2016/08/09 by Daniel.Lamb Fixed cook on the fly server not handling cook requests. #test Cook on the fly shooter game. Change 3082955 on 2016/08/09 by Dmitry.Rekman Linux: convert existing Strcat() uses to Strncat(). - Strcat() does not check destination size so can silently corrupt memory. While this was not observed, this conversion removes this concern altogether. Change 3083772 on 2016/08/10 by Luke.Thatcher [PLATFORM] [PS4] [+] Checking in PS4CrashHandler files so we have a copy in Perforce rather than just on the server. - Taken from \\devweb-02 and removed all the unused files/dependencies. - Created a publish profile pointing to \\devweb-02\Sites\PS4Services\PS4CrashHandlerDev so I'm not writing over the existing deployed crash handler. - Moved all code in the Page_Load event to inside the check for the HTTP method (POST) otherwise GET'ing the page from a browser will generate crash folders that hang around forever. Change 3085450 on 2016/08/11 by Lee.Clark PS4 - Fix mediaplayer pipeline allocation Change 3086360 on 2016/08/11 by Michael.Trepka Fixed a non-unity build error in Mac UnrealFrontend Change 3087224 on 2016/08/12 by Luke.Thatcher [PLATFORM] [PS4] [~] Refactor PS4 Crash Handler site - Removed CoreDumpHandler. Processing dump files is handled directly by an async thread within the aspx process. - Separated configuration values into their own class. Currently set to output to a testing directory, rather than the actual crash reporter landing zone. - Added a debug upload page to allow manual submission of .orbisdmp/.txt settings files, accessible by GET'ing Default.aspx. - Added logging. Logs self-delete after 30 days. Testing required before we switch to the new system. #jira UE-34504 #jira OR-26886 Change 3087626 on 2016/08/12 by Dmitry.Rekman PR #2689: Fix copying/duplicating failing on Linux (UE-34586). - Contributed by Web-eWorks. Change 3087991 on 2016/08/12 by Mark.Satterthwaite Initial AVFoundation implementation of Media Framework for Mac, iOS & tvOS. - Video playback occurs via AVPlayerItemVideoOutput's attached to the AVPlayerItem's output. This means gathering video samples is trivial. - Metal texture updates occur by wrapping the texture object provided by AVF - for Mac this is simple as it can bind to the IOSurface directly, for iOS/tvOS we have to create a CVMetalTextureCache and allocate our texture from there. - OpenGL and OpenGLES currently have to lock the pixel buffer and upload to a texture the old fashioned way - this should be revisited when there is time. - Subtitles/Captions are captured using AVPlayerItemLegibleOutput which also connects to the AVPlayerItem's output. - On Mac audio samples are returned by manually reading from the stream using an AVAssetReaderTrackOutput, including manual seeking and synching. - On iOS/tvOS the audio is played directly by AVPlayer because the IOSAudio system can't handle procedural buffers - otherwise it could reuse the Mac code. - AVFoundation does not support AVI - that's an obsolete Microsoft/Windows file-format. - Only 'file://' URLs are supported - streaming would require a totally different audio solution (using MTAudioProcessingTap) and has many more edge and failure cases that would need to be handled. #jira UE-34315 Change 3088790 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [~] Hook new PS4 crash handler up to the crash reporter website. - Removed indentation from generated crash context XML file. The crash reporter process does manual XML parsing which doesn't correctly handle whitespace at the start of lines. - Switched the final output folder to match the one the crash reporter process is watching. - Hide upload form on a config variable. #jira UE-34504 #jira OR-26886 Change 3089060 on 2016/08/15 by Luke.Thatcher [PLATFORM] [PS4] [!] Change PS4 crash handler log file extension to ".ps4chlog", otherwise the crash reporter site attaches the wrong log file to the crash report. Allowed showing of debug upload form via "Default.aspx?showform=1" query string. #jira UE-34504 #jira OR-26886 Change 3089089 on 2016/08/15 by Mark.Satterthwaite Duplicated changes to AppleMovieStreamer from CL #3088149. #jira UE-34315 Change 3089460 on 2016/08/15 by Mark.Satterthwaite Duplicate CL #3080971: Workaround a macOS 10.12 Beta bug on some Metal drivers that can't initialise temporary/local variable arrays, only those that are marked threadgroup shared. #jira UE-34355 Change 3089465 on 2016/08/15 by Mark.Satterthwaite For Metal shader translation retain more precision for float constants -1.0f >< 1.0f by emitting them in scientific notation - prevents Hammersley constant amongst others from being flushed to 0. Change 3089902 on 2016/08/15 by Daniel.Lamb Changed the next compiling ID to the correct compiling ID. #test Cook Change 3089903 on 2016/08/15 by Daniel.Lamb Cooker monitors config useage during cook and uses those settings to invalidate cooked content instead of all config settings. Change 3090114 on 2016/08/16 by Luke.Thatcher [PLATFORM] [PS4] [~] Minor change to PS4 settings text on crash handler site. Change 3090949 on 2016/08/16 by Nick.Shin WebSocketNetDriver crash fix filled in missing chunk of code that calls PacketHandler's "packet modifiers" #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket #code.review john.pollard john.barrett Change 3091265 on 2016/08/16 by Brent.Pease Add IOS support to HarfBuzz Change 3091267 on 2016/08/16 by Brent.Pease Add references to fix mono build Change 3091291 on 2016/08/16 by Nick.Shin CIS warning fix #jira UE-25492 HTML5 Client cannot connect to Windows Server #jira UE-30880 WinServer crashes when NetDriver is set to WebSocket and Client attempts to connect via websocket Change 3091781 on 2016/08/17 by Joe.Barnes UE-33640: Exposed UPrimitiveComponent::IsAnyRigidBodyAwake() to Blueprints. Change 3092687 on 2016/08/17 by Daniel.Lamb Added support for using binned allocator in cooker instead of tbb. #test Cook shootergame. Change 3093867 on 2016/08/18 by Mark.Satterthwaite Use a read/write mutex to protect access to Metal's internal shader pipeline caches so that parallel threads can progress in the common case where new shaders are not being compiled. Change 3093950 on 2016/08/18 by Mark.Satterthwaite Change the Mac GPU identification code to cope with AMD's new naming scheme on 10.12. Change 3093951 on 2016/08/18 by Mark.Satterthwaite More SCW threads on Mac - they work now. Change 3093960 on 2016/08/18 by Mark.Satterthwaite Increase the default number of command-buffers on Mac because bigger games overflow the current limit of 64 per queue. Change 3096493 on 2016/08/22 by Jeff.Campeau Use Xbox version of DirectX include. Change 3097509 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor PS4 Symbol Publish - Moved the SymStore task from Win.Automation to BuildGraph.Automation, and made it more generic. - The specifics of uploading symbols are now implemented in the platform tool chain, alongside StripSymbols(). - Re-generated the build graph schema file. - Removed the old PS4 symbols upload path in the package step. Modified OrionBuild.xml to publish symbols for all PS4 dev, test and shipping config builds of OrionClient. Change 3097635 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Refactor Age Symbols task in UAT. - Moved the AgeStore task from Win.Automation to BuildGraph.Automation and made it more generic. - Symbol server directory structure is now defined by the platform tool chain, which the common task uses to clean out old symbols. - Added a "filter" parameter to prevent age tasks deleting symbols from unrelated builds in shared symbol servers. Modified OrionBuild.xml to age both the Windows and PS4 symbol stores. Change 3097713 on 2016/08/23 by Luke.Thatcher [PLATFORM] [PS4] [+] Enable new PS4 crash handler server - Created live deployment profile and applied the required config file changes. Change 3099214 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix compile error in PS4 tool chain. For some reason, this only breaks ocassionally. Maybe we're alternating between the 2013 and 2015 C# compilers depending on what initiates the build (e.g. Visual Studio vs GenerateProjectFiles)? Change 3099222 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [+] Added PS4 support for FPlatformMisc::MessageBoxExt using the MsgDialog library. - Note, only one and two button message dialogs are supported (limitation of MsgDialog). Change 3099260 on 2016/08/24 by Luke.Thatcher [PLATFORM] [PS4] [~] Better PS4 exit function. Calls quick_exit instead of abort when we've not asserted. Allows for a "cleaner" forced exit without generating a crash dump. Change 3101192 on 2016/08/25 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3101944 on 2016/08/25 by Daniel.Lamb Ask to save the current level when we are using launch on. Change 3102036 on 2016/08/25 by Nick.Shin check for minimum expected size upon data received from network #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 3102115 on 2016/08/25 by Brent.Pease - Fix small errors that probably only show up in the mac mono build #code.review peter.sauerbrei Change 3102747 on 2016/08/26 by Jeremiah.Waldron Re-submitting OnlineSubsystemGameCircle with TPS permission for Amazon SDK - Also fixed the plugin to remove any related files from the final package when IAP is disabled or GameCircle support itself is disabled with the plugin still enabled - Added support for new AlreadyOwned IAP response code as well which is already used for GooglePlay and IOS Change 3102900 on 2016/08/26 by Nick.Shin since last checkin (CL: 2981945) - prints are crashing the browser - this change will allow browser to print the details via console.log() #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 3103130 on 2016/08/26 by Brent.Pease UE-24679 - Enable the ability to change ports for a firewall to pass them through rsync Change 3103225 on 2016/08/26 by Daniel.Lamb Fixed issue with warning which would cause crash. Change 3103425 on 2016/08/26 by Dmitry.Rekman Enable offscreen GL rendering without X. - Added new video subsystem to SDL that is uses EGL to initialize the context. - Most windoing functions stubbed. - Also added a new test case to TestPAL for easier debugging. Change 3104743 on 2016/08/29 by Brent.Pease Support remote offline metal shader compilation Change 3105051 on 2016/08/29 by Brent.Pease UE-2382 - TASK: MobleMVP: iOS: Add ability to view iOS device console output in the editor UFE - IOS Automation will now create a thread to collect the console logs from the device and send them to C# Console output while the app is running on device - Made ProcessResult an interface (IProcessResult) which ProcessResult implements. This allows platforms to provide their own implementation if needed. - Moved the RunLoop related parts of CoreFoundation into MobileDevice.cs Change 3105053 on 2016/08/29 by Brent.Pease - IOS dll's as part of the last check-in Change 3106853 on 2016/08/30 by Jeff.Campeau Implement FD3D11DynamicRHI::RHICreateComputeFence to prevent memory overwrite Change 3107361 on 2016/08/30 by Dmitry.Rekman Renderer: changes to allow postproc delegates. Change 3107362 on 2016/08/30 by Dmitry.Rekman Plugin with a CUDA postproc example. - Linux version only. Runs under a headless GL too (without X). - Disabled during cross-compilation, can be compiled natively only. - CUDA kernel should be compiled separately, CMakefile with compilation attached (can be used to generate VStudio projects as well). - To test the output, run under the debugger, interrupt and set global variable GSaveTheOutput to 50 (this will write out kernel output buffer 50 times as .bmp files into working directory). Change 3107913 on 2016/08/31 by Daniel.Lamb Fixed loading of cooked content in the editor. Change 3107916 on 2016/08/31 by Daniel.Lamb Added error case when shader compilation fails to notify shader. #test Cook shooter game. Change 3108080 on 2016/08/31 by Josh.Adams - Fixed PS4Automation compile errors Change 3109077 on 2016/08/31 by Brent.Pease Fix C# debug builds by specifying x64 and add reference to MobileDeviceInterface Change 3110086 on 2016/09/01 by Dmitry.Rekman Fix race condition in PThread runnable (UE-35074). - Instead of relying on busy-wait, join the threads. This prevents race between PostRun() (executed in the context of the thread) and FPThreadRunnableThread() destructor (see UE-34909). - Do not use an invalid value for pthread_t, since there's none. Change 3110172 on 2016/09/01 by Dmitry.Rekman Fixed a crash exiting VR Preview on Windows GL4 (UE-28708). - PR #2188 submitted by ardneran. Change 3110313 on 2016/09/01 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3111134 on 2016/09/01 by Dmitry.Rekman UBT: prevent mono from hanging on Ctrl-C. - Sometimes Ctrl-C can cause thread creation to fail. Without this change, UBT would lock up. Change 3111171 on 2016/09/01 by Brent.Pease Move all C# projects to use the x64 Platform for consistency with other changes made to move to the x64 Platform Change 3111177 on 2016/09/01 by Dmitry.Rekman Fix Linux build on systems without CUDA (UE-35460). Change 3111548 on 2016/09/02 by Luke.Thatcher [PLATFORM] [PS4] [!] Fix for PS4 iterative deployment. - Changes in Dev-Mobile broke the deployment manifests, as PS4 was now using the wrong filename when creating delta and obsolete file lists. Change 3111863 on 2016/09/02 by Dmitry.Rekman Better fix for build without CUDA (UE-35460). Change 3112738 on 2016/09/02 by Mark.Satterthwaite Fix the pausing particles on Metal - one line bug in the Metal query implementation meant that the first query wouldn't return the correct result for no good reason. #jira UE-34989 Change 3114579 on 2016/09/06 by Chris.Babcock Fix Vulkan include path in NDK check (contributed by geediiiiky) #jira UE-35490 #github #2758 #ue4 #android Change 3115115 on 2016/09/06 by Jeff.Campeau Calculate buffer size for paks using the bitwindow override as needed Change 3115600 on 2016/09/07 by Luke.Thatcher [PLATFORM] [PS4] [~] Make the crash dump handler registration much earlier, to catch crashes in early engine init. - Fixed up places in FGenericCrashContext::SerializeContentToBuffer which used the command line. If we crash early, the command line may not have been initialized yet. - Added a GetNoInit function to FThreadHeartBeat to avoid creating the heart beat thread if we crash early, and the thread doesn't exist yet. Tested by calling abort() immediately inside int main(), and we get a valid crash dump that the crash handler service can consume. Change 3115676 on 2016/09/07 by Luke.Thatcher [PLATFORM] [~] Dev-Platform integration fix for original CL 3064888 in //Orion/Release-29.1 Add .exe and .dll to windows symbol upload file filters. Change 3115811 on 2016/09/07 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3115944 on 2016/09/07 by Michael.Trepka Implemented IsGamepadAttached() for Mac Change 3115948 on 2016/09/07 by Michael.Trepka Don't try to restore Help menu item on Mac if MenuBlock does not contain it Change 3116200 on 2016/09/07 by Jeff.Campeau Fix parameter ordering Change 3117660 on 2016/09/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3117728 on 2016/09/08 by Michael.Trepka Copy of CL 3117698 by Mike.Fricker Fixed regression with editor's Simulate mode where cursor would teleport back to the center of the viewport after every click - This bug was introduced in CL 3075932 from a borderless window cursor handling fix that was needed for games that capture the cursor Change 3117797 on 2016/09/08 by Peter.Sauerbrei Shader Resource compression Change 3117988 on 2016/09/08 by Brent.Pease - Solutiion generator will now pick x64 instead of AnyCPU for the default platform configuration - Fix what I think was a merge error in BuildGraph.cs Change 3118296 on 2016/09/08 by Daniel.Lamb Fixed crash with launch on. Couldnt' correctly detect previous generated ini settings. #test launch on QA game #jira UE-35741 Change 3118438 on 2016/09/08 by JohnHenry.Carawon Fix UAT compilation on Linux #UE-35745 Change 3118934 on 2016/09/08 by Jeff.Campeau Shader compression setting based on target platform instead of cooking host platform. #jira UE-35753 Change 3120190 on 2016/09/09 by Ben.Marsh Add missing Platform attribute to build script for Dev-Platform. [CL 3120378 by Josh Adams in Main branch]
2016-09-09 20:13:41 -04:00
IProcessResult Result = CommandUtils.Run(HostPlatform.Current.P4Exe, "set P4PORT", null, CommandUtils.ERunOptions.NoLoggingOfRunCommand);
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140) ========================== MAJOR FEATURES + CHANGES ========================== Change 2959679 on 2016/04/28 by Ben.Marsh UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag. Change 2959695 on 2016/04/28 by Ben.Marsh UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter". Change 2960798 on 2016/04/29 by Ben.Marsh Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT. Change 2960928 on 2016/04/29 by Ben.Marsh UGS: Change filter for buildmachine changes to only include rebuilt lightmaps. Change 2963214 on 2016/05/02 by Ben.Marsh BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running. Change 2964454 on 2016/05/03 by Ben.Marsh Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing. Change 2964533 on 2016/05/03 by Ben.Marsh BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS. Change 2964852 on 2016/05/03 by Ben.Marsh BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so. Change 2966856 on 2016/05/04 by Ben.Marsh EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc... Change 2966867 on 2016/05/04 by Ben.Marsh EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval. Change 2967504 on 2016/05/05 by Ben.Marsh UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription. Change 2967778 on 2016/05/05 by Ben.Marsh UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG. Change 2967815 on 2016/05/05 by Ben.Marsh EC: Copy the initial resource pool setting from the stream settings into an EC property Change 2967873 on 2016/05/05 by Ben.Marsh EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet. Change 2969294 on 2016/05/06 by Ben.Marsh EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments. Change 2969371 on 2016/05/06 by Ben.Marsh EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams. Change 2970623 on 2016/05/09 by Ben.Marsh UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered. Change 2970627 on 2016/05/09 by Ben.Marsh UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants. Change 2972140 on 2016/05/10 by Ben.Marsh Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger. #lockdown Nick.Penwarden [CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
if (Result.ExitCode == 0)
{
const string KeyName = "P4PORT=";
if (Result.Output.StartsWith(KeyName))
{
int LastIdx = Result.Output.IndexOfAny(new char[] { ' ', '\n' });
if (LastIdx == -1)
{
LastIdx = Result.Output.Length;
}
P4PortEnv = Result.Output.Substring(KeyName.Length, LastIdx - KeyName.Length);
}
}
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140) ========================== MAJOR FEATURES + CHANGES ========================== Change 2959679 on 2016/04/28 by Ben.Marsh UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag. Change 2959695 on 2016/04/28 by Ben.Marsh UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter". Change 2960798 on 2016/04/29 by Ben.Marsh Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT. Change 2960928 on 2016/04/29 by Ben.Marsh UGS: Change filter for buildmachine changes to only include rebuilt lightmaps. Change 2963214 on 2016/05/02 by Ben.Marsh BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running. Change 2964454 on 2016/05/03 by Ben.Marsh Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing. Change 2964533 on 2016/05/03 by Ben.Marsh BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS. Change 2964852 on 2016/05/03 by Ben.Marsh BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so. Change 2966856 on 2016/05/04 by Ben.Marsh EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc... Change 2966867 on 2016/05/04 by Ben.Marsh EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval. Change 2967504 on 2016/05/05 by Ben.Marsh UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription. Change 2967778 on 2016/05/05 by Ben.Marsh UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG. Change 2967815 on 2016/05/05 by Ben.Marsh EC: Copy the initial resource pool setting from the stream settings into an EC property Change 2967873 on 2016/05/05 by Ben.Marsh EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet. Change 2969294 on 2016/05/06 by Ben.Marsh EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments. Change 2969371 on 2016/05/06 by Ben.Marsh EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams. Change 2970623 on 2016/05/09 by Ben.Marsh UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered. Change 2970627 on 2016/05/09 by Ben.Marsh UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants. Change 2972140 on 2016/05/10 by Ben.Marsh Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger. #lockdown Nick.Penwarden [CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
// Otherwise fallback to the uebp variables, or the default
if(String.IsNullOrEmpty(P4PortEnv))
{
// Try to read the P4PORT environment and check if it is set correctly
P4PortEnv = Environment.GetEnvironmentVariable(EnvVarNames.P4Port);
// If not, try to fallback to Mapping.P4Port and set this as P4PORT before continueing
if (!String.IsNullOrEmpty(P4PortEnv))
{
Log.TraceWarning("P4PORT is not set. Falling back to {0} which is set to {1}.", EnvVarNames.P4Port, P4PortEnv);
}
else
{
// If that fails as well, we just give it a shot with perforce:1666 and hope that this works
Log.TraceWarning("P4PORT is not set. Trying to fallback to perforce:1666");
P4PortEnv = "perforce:1666";
}
}
Environment.SetEnvironmentVariable("P4PORT", P4PortEnv);
}
return P4PortEnv;
}
}
}