Commit Graph

55 Commits

Author SHA1 Message Date
jason walter
04b62d4707 Add a special check for persisting deleted assets.
#jira UE-133226
#rb francis.hurteau

#ROBOMERGE-AUTHOR: jason.walter
#ROBOMERGE-SOURCE: CL 18309060 in //UE5/Release-5.0/... via CL 18309098
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18309139 by jason walter in ue5-release-engine-test branch]
2021-11-29 09:32:25 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
jason walter
8f40cac4c0 Resolve uninitialized variables in UE5/Main CIS
#jira UE-130832
#rb none

#ROBOMERGE-AUTHOR: jason.walter
#ROBOMERGE-SOURCE: CL 17735487 in //UE5/Release-5.0/... via CL 17738001
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v879-17706426)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17738245 by jason walter in ue5-release-engine-test branch]
2021-10-06 14:16:46 -04:00
simon therriault
551337f1c1 - Fixing VP tools toolbar button location
#rb jason.walter, dominik.peacock, zach.brockway, flo.schar
#preflight 614c7412812be500014d5e96

#ROBOMERGE-AUTHOR: simon.therriault
#ROBOMERGE-SOURCE: CL 17607364 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17607367 by simon therriault in ue5-release-engine-test branch]
2021-09-23 09:15:34 -04:00
jason walter
f94339d81b Do not store a weak ptr to the session. Depending on timing this could get reset after the UI is constructed. We can just refer to the global client to get current session info.
#jira UE-126494
#rb zach.brockway

#ushell-cherrypick of 17492605 by jason.walter

#ROBOMERGE-AUTHOR: jason.walter
#ROBOMERGE-SOURCE: CL 17583174 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17583204 by jason walter in ue5-release-engine-test branch]
2021-09-21 11:54:53 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
jason walter
cc42a9417f Add ValidationMode support case when p4 command fails
#jira none
#rb none

#ushell-cherrypick of 16171473 by jason.walter

#ROBOMERGE-SOURCE: CL 16332438 in //UE4/Release-4.27/... via CL 16348245
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16359343 by jason walter in ue5-release-engine-staging branch]
2021-05-17 17:21:28 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
Patrick Boutot
190e76913f Deprecate non-const binding function in TAttribute. TAttribute::Steal now returns an inplace TVariant, before an ObjectType was created by the default constructor.
#rb steve.robb
#preflight 605b46b6e8944a0001cf35a7

[CL 15798959 by Patrick Boutot in ue5-main branch]
2021-03-24 10:43:43 -04:00
michael noland
9756461b45 Quick pass at some plugin category clean up
- Moved various things from "Programming" and "Blueprints" to more domain-specific categories
- Merged "Media" and "Movie Players" into "Media Players"
- Merged "Automation" into "Testing"
- Merged "Widgets" and "Web" into "UI"
etc...
[FYI] brooke.hubert
#jira UE-106862

#ROBOMERGE-SOURCE: CL 15390321 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15390329 by michael noland in ue5-main branch]
2021-02-11 14:59:10 -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
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
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
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
Matt Kuhlenschmidt
6a31e1b93b Fix multi-user toolbar button not appearing in new toolbar if enabled.
#rb none

[CL 13212072 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 15:40:38 -04:00
francis hurteau
72562b72e7 Expose a Server Port settings for the Multi-User server unicast endpoint over the passed UDP messaging settings when booting the server from the Editor
#jira UE-91000
#rb Jamie.Dale

#ROBOMERGE-SOURCE: CL 12381903 in //UE4/Release-4.25/... via CL 12381904
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12381906 by francis hurteau in Main branch]
2020-03-23 15:15:40 -04:00
francis hurteau
9739d39cb9 Fixed Udp Messaging static endpoints not being properly sent to when the unicast endpoint was forced to a specific interface.
Modified the Multi-User Server launching to bind different port ont he unicast endpoint port of the editor is set when it transfer its settings to it.

Updated Udp messaging settings tooltip as well as multi-user launch server button

#jira UE-91000
#rb Jamie.Dale

#ROBOMERGE-SOURCE: CL 12370596 in //UE4/Release-4.25/... via CL 12370631
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12370651 by francis hurteau in Main branch]
2020-03-23 10:57:41 -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
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
patrick laflamme
58925c4e1d #jira UE-87927 - Disaster Recovery doesn't restore a crash from a restored session
- Added the ability to copy and restore a live session, preventing the need to archive it in first place, making the server exist fast (releasing the session lock very quickly) before showing the crash UI and before the next Editor instance could starts.

Details:

This bug could manifest if various ways. An issue causing this bug was fixed in 11252374. This bug can also be observed if the crash reporting process doesn't release its lock on the crashed session quickly. Archiving a session may takes several minutes (depending on the session size) and while a session is archiving, its database is locked and cannot be restored until the archiving process complets. When the Editor reboots after a crash, it searches for a session to recover, but skip over any session that is mounted/locked assuming the session is concurrently used by a concurrent Editor process, potentially preventing it from restoring. The optimal way to work around this problem  is to skip the archiving step. Instead, the live session is never archived (saving a copy), which allows the recovery service to shutdown and release the session lock very quickly ensuring that the session will be unlocked when the Editor restarts. On Editor start, it a crashed session is found and the user decides to restore it, the live session is copied into a new live session.

This changelist also affect those other jira in the following ways:

#jira UE-87899 - Disaster recovery prevents showing the crash reporting UI in a timely manner if the session is large
  - This CL changes execution order to shut down the recovery service ASAP to release the lock, but the optimization above make it super fast, so the UI should always be shown in a timely manner.

#jira UE-87927 - Disaster Recovery doesn't restore a crash from a restored session
  - This CL ensures the recovery service release the session lock faster than the next instance of the Editor can start.

#jira UE-87900 - Disaster Recovery stops recording transactions if the UDP transport layer restarts or auto-repair
#jira UE-88517 - Concert Log Spam - (ConcertKeepAlive) discarded
  - This CL fixes an issues with endpoints timeout logic.

#jira UE-81049 - Clean up the DisasterRecovery Intermediate directory
  - This CL added code to clean up the intermediate directory left over by crashed client.

#rb Francis.Hurteau

#ROBOMERGE-SOURCE: CL 11632069 in //UE4/Release-4.25/... via CL 11632084
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11632094 by patrick laflamme in Main branch]
2020-02-26 11:18:30 -05:00
Patrick Boutot
b67ff68e04 Copying //UE4/Dev-VirtualProduction to //UE4/Dev-Tools-Staging @ 11168401
#rb none
#rnx

[CL 11170710 by Patrick Boutot in Dev-Tools-Staging branch]
2020-01-29 18:45:15 -05:00
Francis Hurteau
8f42d9c427 fixed small typo
#rb trivial

[CL 11058817 by Francis Hurteau in Dev-VirtualProduction branch]
2020-01-17 17:32:24 -05:00