Commit Graph

100 Commits

Author SHA1 Message Date
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Patrick Laflamme
66d478b8d2 Added missing override method operator<<(FObjectPtr& Obj) to FConcertSyncObjectWriter and FConcertSyncObjectReader to fix the 'not implemented' asserts firing in the FArchive base class implementation.
#jira UE-107531 - Fatal Error setting Package Mode to External for individual actors when Recovery Hub is enabled
#rb Francis.Hurteau
#fyi Jason.Walter

[CL 15280112 by Patrick Laflamme in ue5-main branch]
2021-02-02 10:46:03 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
julien lheureux
2bb7495a45 - Added new, delete, edit changelist commands
- Added revert unchanged on changelists & files
- Added changelist parameter to the Execute method of ISourceControlProvider (& updated all derived classes)
- Fixed style problem in the Perforce settings dialog

#rb sebastien.lussier

[CL 15128504 by julien lheureux in ue5-main branch]
2021-01-18 09:42:33 -04:00
Matt Kuhlenschmidt
c13ac505b2 Updated source control icons
Source control providers now require an FSlateIcon and implementation of GetIcon instead of overriding mutliple functions to do the same thing. Fixed up all known source control providers.

#jira UETOOL-2812

[CL 15045642 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-11 20:50:19 -04:00
Sebastien Lussier
6be153a555 Added initial support for changelists to the source control providers
#rb julien.lheureux

[CL 15039900 by Sebastien Lussier in ue5-main branch]
2021-01-11 14:32:27 -04:00
Matt Peters
aae0fe62eb PackageResourceManager and PackagePaths
Create a new interface IPackageResourceManager that handles all attempts to load packages from storage. The default implementation passes through to loading from IFileManager. Future implementations will load from other services such as the EditorDomain and TargetDomain.
Add FPackagePath class that holds a LocalFilePath or LongPackageName, or a relative path to a package under a mounted content root (which can be converted into either the LocalFilePath or LongPackageName).
Modify LinkerLoad, BulkData, and AsyncLoader to use FPackagePath and IResourceManager.
Modify UPackage and FLinkerLoad to have a FPackagePath instead of a Filename.
#rb Paul.Chipchase, CarlMagnus.Nordin, Francis.Hurteau, Devin.Doucette
#rn Major Core

[CL 14814912 by Matt Peters in ue5-main branch]
2020-11-25 22:11:10 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Patrick Laflamme
5ff173de0e Fixed the most obvious styling errors for Multi-Users and Disaster Recovery UI.
Replaced usage FEditorStyle by FAppStyle as documentation states in FAppStyle.h

#rb Jamie.Dale
#fyi Francis.Hurteau

[CL 14810414 by Patrick Laflamme in ue5-main branch]
2020-11-24 14:30:52 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Fred Kimberley
eb2edb9b69 Adding lightweight instances subsystem for gameplay objects.
Lightweight instances allow a low memory representation of objects. Instances can be converted into full actors when necessary. Actors can also be reduced down to light weight instances when the full representation is no longer needed.
Hit results now return a handle that may refer to either an actor or lightweight instance.

#rb Michael.Noland

[CL 14369221 by Fred Kimberley in ue5-main branch]
2020-09-22 15:55:19 -04:00
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Matt Kuhlenschmidt
c16f0bfe77 Avoid rogue slow task dialog appearing for a few frames due to concert checking connection. Now we wait until the connection takes longer than a second before showing
[CL 13683433 by Matt Kuhlenschmidt in ue5-main branch]
2020-06-16 09:31:00 -04:00
Matt Kuhlenschmidt
603a4119c5 Fix HAL/PlatformFileManager.h non-portable casing CIS issues
#rb none

[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
max chen
9d568c459b Sequencer: Playback controls
Deprecated PlayTo, ScrubTo, JumpTo for Frames, Seconds, and MarkedFrames. Replaced with SetPlaybackPosition() which takes PlaybackParams to specify the position (ie, frame, seconds, or marked frame) and an update method (play, scrub, jump).

Also, adding a new feature/function:

PlayTo() - play from the current time to a specified time

#rb andrew.rodham

#ROBOMERGE-SOURCE: CL 13137367 via CL 13137369 via CL 13137373
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v687-13115495)

[CL 13137377 by max chen in Main branch]
2020-05-01 00:11:16 -04:00
Patrick Laflamme
3aa8c48447 Fixed DisasterRecovery asserting if the recovery session database could not be open or was corrupted.
- Changed the recovery session activity stream to return 'I'm done' when it encounters an error to prevent the caller to ignore the error and continue asking new activities (which triggers the assert).
  - Handled the error reported by the stream when searching for a recoverable session just after the Editor finished its initialization.

Fixed DisasterRecovery freezing the Editor if the new session database could not be created successfully.
  - Reported the error to the client instead of silently ignoring it.
  - Updated the verbose log to Warning to let the user know that a new session could not be created (and therefore disaster recovery is going to be off.

#jira UE-89128 - Re-Opening Game After Trying to Add a Cooked Material to a Level Results in a Crash
#rb Jamie.Dale

Details:
  - The bug UE-89128 is possibly related to UE-89826 (at least on Mac) where the database file would fails to open successfully. Corrupted database/broken file API would fail to open the database file and will result in the assert below:
        Assertion failed: (RequestFetchCount < 0 && LowestFetchedActivityId == 0) || (RequestFetchCount > 0 && LowestFetchedActivityId > 1) [File:/Users/build/Build/++UE4+Licensee/Sync/Engine/Plugins/Developer/Concert/ConcertSync/ConcertSyncClient/Source/ConcertSyncClient/Private/ConcertActivityStream.cpp] [Line: 66]

This CL fix can be tested by:
      1. Launch the Editor, generate a crash with 'debug crash' command.
      2. Comment 'SessionDatabase->Open(Session->GetSessionWorkingDirectory());' in Engine\Plugins\Developer\Concert\ConcertSync\ConcertSyncServer\Source\ConcertSyncServer\Private\ConcertSyncServerLiveSession.cpp to simulate SQLite failing to open the database.
      3. Recompile CrashReportClientEditor(Windows) or UnrealRecoverySvc(Mac/Linux)
      4. Relaunch the editor.

[CL 12393668 by Patrick Laflamme in 4.25 branch]
2020-03-24 17:03:17 -04:00
Robert Manuszewski
321457eb31 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

[CL 12190998 by Robert Manuszewski in 4.25 branch]
2020-03-15 10:08:50 -04:00
Patrick Laflamme
c23bd47df1 #jira UE-90467 - //UE4/Main - UE4 Static Analysis Win64 (MSVC) - ConcertSyncSessionDatabase.cpp Warning: Dereferencing NULL pointer 'PackageDataStream.DataAr'
- Added null check to remove the warning.

#rnx
#rb trivial

[CL 12133517 by Patrick Laflamme in 4.25 branch]
2020-03-11 13:09:04 -04:00
Patrick Laflamme
491f20810f Fixed missing include files reported by CIS in ConcertLocalFileSharingService.cpp and ConcertServerWorkspace.cpp
#rnx
#rb none
#jira UE-85652

[CL 12117594 by Patrick Laflamme in 4.25 branch]
2020-03-10 16:37:23 -04:00
Patrick Laflamme
d9afcc0448 Improved scalability of Disaster Recovery
- Converted Concert API transferring package data in-memory only model to a streaming model to support packages bigger than 2 GB. (TNumberiLimit<int32>::max())
  - Added the IConcertFileSharing interface to share large files between the client and the server. This is used as a side channel to the Concert request/response and event protocol.
  - Fixed the ConcertClientPackageManager to prevent sending the package data for each the 'pre-save' when the 'live sync'  is off. It only emits it once.
  - Fixed UI to correctly report pre-save vs save vs auto-save for package as well as when a package is discarded.

#jira UE-85652 - Crash when importing large FBX with Morph Targets and Disaster Recovery enabled
#jira UE-78722 - Potential Memory Leak with Disaster Recovery Plugin

#rb Francis.Hurteau, Jamie.Dale

[CL 12113821 by Patrick Laflamme in 4.25 branch]
2020-03-10 14:24:53 -04:00
Jamie Dale
d9409a29f2 Cycle the database closed/open in the session test to validate that it can be opened again
#jira UE-89826
#rb none
#rnx

[CL 12026176 by Jamie Dale in 4.25 branch]
2020-03-06 18:16:43 -05:00