Commit Graph

66 Commits

Author SHA1 Message Date
jason walter
c213fe29c3 More Non-unity fixes
#jira UE-145435
#jira UE-144997
#rb none
#fyi dominik.peacock
#preflight 622a0fac6c2b449433b91dc4

[CL 19336169 by jason walter in ue5-main branch]
2022-03-10 10:28:35 -05:00
Dominik Peacock
6816c4ca90 Unshelved from pending changelist '19219261':
Add dialog box when archiving or deleting session

#jira none
#rb none
#preflight 6227cc0da83706728763311f

[CL 19318403 by Dominik Peacock in ue5-main branch]
2022-03-09 05:41:41 -05:00
jason walter
76274ae29e Fix non-unity build errors.
#jira UE-145000
#jira UE-144997
#jira UE-144996

#fyi dominik.peacock
#rb none
#preflight 6226586b06521a56d5db23ba

[CL 19290027 by jason walter in ue5-main branch]
2022-03-07 14:42:23 -05:00
Dominik Peacock
468f42ca91 Move files to correct modules (step 2 of refactoring SSessionHistory)
#jira UE-144451
#rb none
#preflight 621fc391f571de393ad5d21b

[CL 19240886 by Dominik Peacock in ue5-main branch]
2022-03-03 05:19:32 -05:00
Dominik Peacock
f2e1433526 Hide IConcertSyncClient from SSessionHistory
#jira UE-144109
#rb Matt.Johnson
#preflight 621e44d6e15c51d8c5d28f65

[CL 19219134 by Dominik Peacock in ue5-main branch]
2022-03-02 03:36:15 -05:00
Dominik Peacock
ec378476f5 Add session browser to multi user server
#jira UE-143868
#rb Matt.Johnson
#preflight 621a78278872c7be925ff5ec

[CL 19198841 by Dominik Peacock in ue5-main branch]
2022-03-01 10:51:03 -05:00
Dominik Peacock
6fca292f53 Adjust undo history and multi user UI to new UE5 conventions
#jira UE-143405
#jira UE-141594
#rb trivial
#preflight 621cef694972367857a09ba5

[CL 19175326 by Dominik Peacock in ue5-main branch]
2022-02-28 11:47:39 -05:00
Dominik Peacock
dd1a4dfdb5 Remove ConcertSyncClient dependency from ConcertSharedSlate
#jira UE-143326
#rb Matt.Johnson
#preflight 6214f963a97c2c3348cd5745

[CL 19090934 by Dominik Peacock in ue5-main branch]
2022-02-23 09:48:01 -05:00
Dominik Peacock
32f7389d47 Fix non-unity issue
#jira UE-143206
#rb none
#preflight none

[CL 19062416 by Dominik Peacock in ue5-main branch]
2022-02-19 03:54:32 -05:00
Dominik Peacock
ac0fa6790c Fix compile issue on Linux
#jira none
#rb none
#preflight none

[CL 19034877 by Dominik Peacock in ue5-main branch]
2022-02-17 10:11:58 -05:00
Dominik Peacock
d2cd16d5eb Extract session table to re-usabe UI widget
#jira UE-138321
#rb Matt.Johnson
#preflight 620cf9246202a22eede2e5af

[CL 19034711 by Dominik Peacock in ue5-main branch]
2022-02-17 09:58:35 -05:00
Dominik Peacock
ed2deb1775 Added missing files
#jira none
#rb none
#preflight none

[CL 18950859 by Dominik Peacock in ue5-main branch]
2022-02-11 07:18:14 -05:00
Dominik Peacock
ff8b0c25c7 Create slate UI for multi user server
#jira UE-138321
#rb Jason.Walter
#preflight 6204f7f8a8129f65b75914e9

[CL 18949739 by Dominik Peacock in ue5-main branch]
2022-02-11 02:23:45 -05:00
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
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