Commit Graph

15 Commits

Author SHA1 Message Date
wouter burgers
2daa2f0820 SkeinUE: Fixed conflicted icon incorrectly being white in some areas since #30499647.
[FYI] manuel.lang
#rnx

[CL 30684127 by wouter burgers in ue5-main branch]
2024-01-18 10:27:11 -05:00
marco anastasi
0922d218c0 Fix for "icons for asset change states aren't displaying" in Snapshot History tab
[REVIEW] [at]wouter.burgers, [at]manuel.lang
#rb Manuel.Lang
[FYI] wouter.burgers, manuel.lang

#localization none
#tests ran local build and preflight
#preferred_allowlister alex.kahn

[CL 30600518 by marco anastasi in ue5-main branch]
2024-01-12 14:34:43 -05:00
wouter burgers
432c808da4 SkeinUE: Changed conflicted icon used by Skein to be white (in the file) with a warning color applied instead of being a colored icon in the file.
[FYI] manuel.lang
#rnx

[CL 30499754 by wouter burgers in ue5-main branch]
2024-01-09 04:08:55 -05:00
marco anastasi
9be55ae1ae Populate Assets List in expanded Snapshot view
Created Asset Class 'filter pill' widget
Extended Assets List to display a colour pill representing the asset class

#rb wouter.burgers

[CL 30443162 by marco anastasi in ue5-main branch]
2023-12-22 14:15:22 -05:00
wouter burgers
bc627402f6 Skein / ConflictUE: Assorted conflict resolution UI updates. See JIRA for checkmarked list.
#rb Marco.Anastasi
#rnx

[CL 30379040 by wouter burgers in ue5-main branch]
2023-12-18 12:54:53 -05:00
marco anastasi
367d9976f1 Added warning highlight to Asset List [No.] column when user has rewound to an older revision
#rb wouter.burgers

[CL 30038475 by marco anastasi in ue5-main branch]
2023-12-01 08:23:59 -05:00
marco anastasi
4fc92d88f3 * Create 'Check in before syncing older snapshot' dialog
* Create Warning dialog for further rewind
* Implement 'Sync snapshot' functionality
* Implement 'Rewind to' functionality

#rb wouter.burgers

[CL 30015297 by marco anastasi in ue5-main branch]
2023-11-30 10:36:24 -05:00
marco anastasi
3ccf57012b * Implemented basic Snapshot List
* Added Snapshot creator avatar to Snapshots list
* Extended information displayed in snapshot state column in Snapshot list

#rb Stuart.Hill, wouter.burgers

[CL 29867991 by marco anastasi in ue5-main branch]
2023-11-21 12:06:27 -05:00
paul chipchase
0743e8dd17 Fix SOURCE_CONTROL_WITH_SLATE to work properly again in the SourceControl module
#rb wouter.burgers
#rnx

### SourceControl
- Remove link to "InputCore" as it is not used
- Only include slate and rendering modules if the target we are building for uses slate.
- Define SOURCE_CONTROL_WITH_SLATE as 0 if the target we are building for does not use slate.

- When SOURCE_CONTROL_WITH_SLATE is zero the following will be applied:
-- FRevisionControlStyleManager will not be compiled as it only makes sense if slate is enabled.
-- The monitoring aspect of FSourceControlFileStatusMonitor will be disabled as we cannot be notified of user interactions.
-- FScopedSourceControlProgress will compile but essentially do nothing.
-- The ::GetIcon method of ISourceControlState will no longer be compiled as it returns a FSlateIcon by value.

[CL 29516345 by paul chipchase in ue5-main branch]
2023-11-07 06:18:43 -05:00
wouter burgers
72c64e7815 RevisionControlStyle: Added 'OpenExternal' icon.
[FYI] manuel.lang, marco.anastasi
#rnx

[CL 29140386 by wouter burgers in ue5-main branch]
2023-10-26 12:50:03 -04:00
wouter burgers
1702425807 Skein / ConflictUE: Add conflict information to StatusBar.
Why? These buttons have to behave differently when there are unresolved conflicts remaining.

Note that it isn't possible to add a build dependency from a module in /Engine to the Skein module in /Engine/Plugins, hence the cvar/ccmd approach.

#rb manuel.lang, marco.anastasi
#rnx

[CL 28220661 by wouter burgers in ue5-main branch]
2023-09-26 06:31:30 -04:00
stanley hayes
d5af451d80 #JIRA: SOL-4250
Adding a modified icon for revision control, icon is a grey checkmark with a dot

#rb YiLiang.Siew
#rb Jared.Cotton
#rb Manuel.Lang
#rb Wouter.Burgers
[FYI] Erik.Dillinger


#rnx
#preflight 641215e35819afacaf249f90

[CL 24727408 by stanley hayes in ue5-main branch]
2023-03-20 21:00:06 -04:00
marco anastasi
641c93f543 Updated icons for Check-in Changes and Sync Latest status bar buttons
#rb wouter.burgers
#preflight 63f3d7321d71bcd2624a4feb

[CL 24332254 by marco anastasi in ue5-main branch]
2023-02-20 21:07:58 -05:00
aditya ravichandran
87a76764d5 Revision Control Style: Update conflicted icon color
#rb trivial

[CL 23480874 by aditya ravichandran in ue5-main branch]
2022-12-12 14:30:17 -05:00
aditya ravichandran
28eccf9aa0 Revision Control Iconography Update:
Update the default set of revision control icons
Create FRevisionControlStyleManager to manage the currently active revision control style and add a default style that is used by all providers
#rb lauren.barnes, brooke.hubert
#preflight 639364ee67018b14b5fb9891

[CL 23466976 by aditya ravichandran in ue5-main branch]
2022-12-09 14:18:01 -05:00