Commit Graph

17 Commits

Author SHA1 Message Date
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
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
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 Boutot
410c720ac7 Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx
#author jeanmichel.dignard

[CL 10992634 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-15 09:39:21 -05:00
Patrick Laflamme
34c2c48e24 Improved the customizability and usability of SConcertSessionRecovery and SConcertSessionActivities widgets.
- Exposed more control over the visiblity/effects of the 'RecoverThrougRecoverAll/Cancel' buttons.
  - Exposed an attribute to explain why no activites would be displayed in the SConcertSessionActivities view.
  - Exposed few API useful to control the view.

#rb Francis.Hurteau

[CL 10910208 by Patrick Laflamme in Dev-VirtualProduction branch]
2020-01-08 16:39:47 -05:00
Patrick Laflamme
dde62fd519 Added place-holder icon for the disaster recovery hub.
#rb Francis.Hurteau

[CL 10878419 by Patrick Laflamme in Dev-VirtualProduction branch]
2020-01-06 10:17:18 -05:00
JeanLuc Corenthin
276d3af9b8 Copy up //UE4/Dev-Enterprise/... to //UE4/Dev-Tools-Staging/...
#rb none

[CL 10371791 by JeanLuc Corenthin in Dev-Tools-Staging branch]
2019-11-22 10:05:55 -05:00
Patrick Laflamme
95eb0c77cb Edigrated 9583111
#jira UE-81690 - Assertion Failed clearing DisasterRecovery search field entry
  - Prevented access to the client name functor when populating the search string in DisasterRecovery because the client name is not displayed/available in this mode.

#rb None.

[CL 9616802 by Patrick Laflamme in 4.24 branch]
2019-10-16 10:28:07 -04:00
Patrick Laflamme
ca33944618 Edigrated 9450999
#jira UE-79909 - Update the look and feel of lock icons displayed on an asset with in Multi-User session
#rb Francis.Hurteau

[CL 9616694 by Patrick Laflamme in 4.24 branch]
2019-10-16 10:22:05 -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
patrick laflamme
d09e538af1 #jira UE-77134 - Replace Multi-User Editing Toolbar button with updated graphic
- Replaced the current editor toolbar icons to use more representative icons. It has 2 new icons to represents states of the button that were not represented before (cancel and browse).

#rb trivial

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

[CL 7437921 by patrick laflamme in Main branch]
2019-07-18 10:46:29 -04:00
patrick laflamme
9a7d34d4fa #jira UE-76708 - Multi-User icons in the Menu doesn't have the right tint
- Set the icon tint in the style rather than where the image is used
  - Updated the multi-user tab icon to dim the white in it.

#rb Francis.Hurteau

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

[CL 7154816 by patrick laflamme in Main branch]
2019-06-21 15:14:13 -04:00
patrick laflamme
7e9191e83d #jira UE-76687 //UE4/Main - Incremental UE4Editor Win64 - Undeclared identifiers in ConcertFrontendUtils.h
- Added missing include to SImage.h

#rb Francis.Hurteau

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

[CL 7140838 by patrick laflamme in Main branch]
2019-06-21 10:04:00 -04:00
patrick laflamme
14116bad9b #jira UE-76201 - Update Multi-Users Browser icons/colors
- Replaced FontAwesome with corresponding icons.
  - Tweaked paddings between icons.
  - Tweaked icons color

#rb Francis.Hurteau

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

[CL 7140721 by patrick laflamme in Main branch]
2019-06-21 09:30:54 -04:00
patrick laflamme
558b310ea3 #jira UE-75577 - Sequencer toolbar used place-holder icons for Multi-Users actions
- Updated the icons and style.

#rb Francis.Hurteau

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

[CL 7111856 by patrick laflamme in Main branch]
2019-06-20 16:26:04 -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