Commit Graph

34 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
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
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
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
patrick laflamme
6e788c0e08 #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

#ROBOMERGE-SOURCE: CL 12133517 in //UE4/Release-4.25/... via CL 12133544
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12140402 by patrick laflamme in Main branch]
2020-03-11 17:10:38 -04:00
patrick laflamme
07538b180c Fixed missing include files reported by CIS in ConcertLocalFileSharingService.cpp and ConcertServerWorkspace.cpp
#rnx
#rb none
#jira UE-85652

#ROBOMERGE-SOURCE: CL 12117594 in //UE4/Release-4.25/... via CL 12117601
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12117615 by patrick laflamme in Main branch]
2020-03-10 16:38:03 -04:00
patrick laflamme
94b4e6d5ad 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

#ROBOMERGE-SOURCE: CL 12113821 in //UE4/Release-4.25/... via CL 12113828
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12113837 by patrick laflamme in Main branch]
2020-03-10 14:25:48 -04:00
patrick laflamme
806218fcbd #jira UE-85967 - UnrealDisasterRecoveryService character length is long and can easily max out path length
#jira UE-88070 - UnrealDisasterRecoveryService paths are too long
  - Renamed UnrealDisasterRecoveryService as UnrealRecoverySvc
  - Set a ConcertSyncServer ShortName as "CncrtSyncSvr" to ensure shorter build path.

The change saves 29 characters on the offending path. The path before vs the path after:

Engine\Plugins\Developer\Concert\ConcertSync\ConcertSyncServer\Intermediate\Build\Win64\UnrealDisasterRecoveryService\Development\ConcertSyncServer\UnrealDisasterRecoveryService-ConcertSyncServer.lib (Before, 199 chars)
Engine\Plugins\Developer\Concert\ConcertSync\ConcertSyncServer\Intermediate\Build\Win64\UnrealRecoverySvc\Development\CncrtSyncSvr\UnrealRecoverySvc-ConcertSyncServer.lib (After, 170 chars)

#rb Jamie.Dale

Edigrated 11281991 from Dev-VirtualProduction

#ROBOMERGE-SOURCE: CL 11516806 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11516858 by patrick laflamme in 4.25-Plus branch]
2020-02-18 16:17:27 -05:00
francis hurteau
334d3a88e7 Edit base transaction transient property filters to use proper new FProperty supported paths
#rb none
[FYI] Jame.Dale
#jira UE-88729

#ROBOMERGE-SOURCE: CL 11499998 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11500003 by francis hurteau in 4.25-Plus branch]
2020-02-18 10:46:03 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
francis hurteau
9233a9447d Move ConcertSyncCore plugin Engine.ini plugin override to BaseConcertSyncCore.ini base settings to prevent the plugin from locking out saving of Engine.ini settings.
#jira UE-84869
#rb Jamie.Dale
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 10378698 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10378709 by francis hurteau in Main branch]
2019-11-22 15:01:47 -05:00
Francis Hurteau
41729e1400 Edigrate cl 9643151:
Modified `GatherSessionChanges` to only report modified packages without saving live transactions to them deferring it to when files are actually persisted.
`GatherSessionChanges` and `PersistSessionChanges` now takes a list of package names instead of filenames
Gathering the list of changes is also now done entirely using the db instead of being split between the sandbox and the db.
Tracking of persist events are now done in the session db on the client side and is tracked through multiple connections with the same editor instance

#rb Jamie.Dale, Patrick.Laflamme
#jira UE-81070

[CL 9643607 by Francis Hurteau in 4.24 branch]
2019-10-17 11:47:07 -04:00
Francis Hurteau
227af9c0ec Edigrate cl 9600687:
Fixed EnumeratePackageNamesWithLiveTransactions to enumerate just packages with live transactions as opposed to packages with transactions
Fixed applying live transactions to packages properly

#jira UE-81070
#rb Jamie.Dale

[CL 9633903 by Francis Hurteau in 4.24 branch]
2019-10-17 10:46:37 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
Ben Marsh
03b04fc3d1 Change plugins that have a "developer" module to limit their scope to editor builds with -game/-server to "UncookedOnly". Developer modules are meant to be usable by runtime games, and cannot reference editor modules.
#rb none
#jira UE-70913

[CL 8386676 by Ben Marsh in Dev-Build branch]
2019-08-30 16:15:37 -04:00
simon therriault
0702fe6706 - Fixing LiveLink Controller not being applied on other machines of a MU session
- Adding livelink controller out of concert filtering list as an example in concert config and by default in QAGame

#rb daniel.rahier
#jira UE-77464
[FYI] patrick.boutot, francis.hurteau

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: simon.therriault
#ROBOMERGE-SOURCE: CL 7659905 in //UE4/Release-4.23/... via CL 7659906
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7794746 by simon therriault in Dev-Build branch]
2019-08-06 11:25:41 -04:00
jamie dale
469410d055 Updated MU engine versioning to use the current build version
We've seen the compiled-in engine versions get out-of-sync when dealing with pre-built binaries vs binaries built locally by a programmer, so we've changed the validation to use the current engine version, and to override the changelist with the Build.version data (if available). The changelist in the Build.version data will always be the latest CL# synced in UGS, regardless of whether you're using a pre-built or locally compiled editor.

This change makes the older BaseRevision setting redundant, but we've kept it around for now (set to zero) so that we can hopefully change it to store the real content base revision in the future (in a way that works for projects not using UGS, eg) using pre-built editors from the public launcher).

Since the base revision is now always zero, it's been removed from the UI, and the UI has been updated to show you the engine version of a session instead.

#jira UE-77465
#rb Francis.Hurteau
#rnx

#ROBOMERGE-SOURCE: CL 7429459 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7429461 by jamie dale in Main branch]
2019-07-17 15:38:26 -04:00
jamie dale
f53783f913 Added friendly name to the custom version information sent to the server
This allows the server to provide better error messages, as it only natively understands the core set of custom versions, and not versions added by plugins on the client (where it would have previously just shown you the version GUID).

#jira UE-76637
#rb Francis.Hurteau, Patrick.Laflamme
#rnx

#ROBOMERGE-SOURCE: CL 7142404 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7142410 by jamie dale in Main branch]
2019-06-21 11:52:22 -04:00
francis hurteau
86624d42ea Fixed deserialization of LazyObjectPtr in Multi-User when the pointed object is null
#jira UE-75611
#rb Patrick.Laflamme

#ROBOMERGE-SOURCE: CL 7063369 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7063370 by francis hurteau in Main branch]
2019-06-18 10:59:13 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00