Commit Graph

275 Commits

Author SHA1 Message Date
wouter burgers
79b4d19b05 SkeinUE: Changed 'conflict resolution tab icon' to grey instead of yellow to match the rest of the editor.
[FYI] manuel.lang

[CL 31799638 by wouter burgers in ue5-main branch]
2024-02-26 06:30:11 -05:00
wouter burgers
b96d8d30b2 SkeinUE: Refactored SSourceControlControls.
The SSourceControlControls is currently instantiated in two places in the editor: bottom right and as part of the snapshot history panel. Regardless, we would like the behavior of these buttons to be the same. This was accomplished by providing 'defaults' in SourceControlMenuHelpers and then setting temporary 'overrides' in SnapshotHistoryPanel. This wasn't very pretty and somewhat confusing with SSourceControlControls providing a mix of instance and static interfaces and behaviors. I've refactored this with the idea in mind that these buttons should behave similar, wherever they are placed in the editor and providing static methods to control that behavior. The default behavior is now no-op and SnapshotHistory provides the UEFN/Skein behavior.

This also allowed the 'CanAutoSave' code to live in one location (in the SnapshotHistoryController) instead of being duplicated in two spots. This was also not possible because engine code cannot be accessed from SkeinSourceControlSlate, where the SSourceControlControls was being instantiated, resulting in the behavior as described in the JIRA bug.

#rb manuel.lang, marco.anastasi

[CL 31796796 by wouter burgers in ue5-main branch]
2024-02-26 03:57:11 -05:00
patrick boutot
cdb8c262e5 Slate: Add ticking frame to SlateApplication to help prevent a double RHI BeginFrame. The real fix is to enforce the SlateApplication::OnPreTick and OnPostTick to be more strick and hide it from the user.
#jira UE-197511
#rb yohann.dossantos

[CL 31763627 by patrick boutot in ue5-main branch]
2024-02-23 10:25:44 -05:00
wouter burgers
548a1e6b62 SourceControl: Added 'unlocked' as a revision control style icon.
#rb manuel.lang, marco.anastasi
#rnx

[CL 31335666 by wouter burgers in ue5-main branch]
2024-02-09 07:47:48 -05:00
marco anastasi
4f2e25abee * Added Restore as Latest functionality
* Created 'Restore as latest' dialog

#rb wouter.burgers

[CL 31095574 by marco anastasi in ue5-main branch]
2024-02-01 13:58:40 -05:00
steve robb
f029468598 Fixed up a lot of bool-taking container resize functions to take EAllowShrinking instead.
[CL 30729174 by steve robb in ue5-main branch]
2024-01-19 16:41:35 -05:00
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
wouter burgers
dd201728e3 SourceControl: Fixed an error being reported for failing to convert to a package name for non-package files (for example: *.uplugin). This was introduced in #24242330.
#rb Marco.Anastasi
#rnx

[CL 30635104 by wouter burgers in ue5-main branch]
2024-01-16 11:23:59 -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
389ae421f8 Skein / Snapshot History: Assorted snapshot history UI updates. See JIRA for checkmarked list.
#rb Marco.Anastasi
#rnx

[CL 30438221 by wouter burgers in ue5-main branch]
2023-12-22 03:31:43 -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
wouter burgers
5204069750 Skein / ConflictUE: Fixed 'check in changes' no longer redirecting to the 'conflict resolution' window when there are conflicts remaining. This was introduced in #29863963 when SSourceControlControls was created.
#rb Marco.Anastasi
#rnx

[CL 30260472 by wouter burgers in ue5-main branch]
2023-12-12 07:03:52 -05:00
paul chipchase
82618a9ffd Capture info messages for all perforce commands, the calling code can then decide if the info is important or not.
#rb juan.legaz
#jira UE-175581

### Perforce Connection
- FP4ClientUser now takes a FSourceControlResultInfo structure to store the warning/error messages generated during a perforce command, in addition we can now store info messages.
-- In almost all cases the array that was being passed in to store the warning/error messages came from a FSourceControlResultInfo so it doesn't change the overall flow.
- Rather than override ClientUser::OutputInfo to get the info messages we have overridden FP4ClientUser::Message instead as this is the preferred way in the cpp p4 api to capturing messages.
-- One difference between ::Message and the older capturing methods is that the older methods seemed to result in a newline character at the end of the message, which we do not see with the newer capture method. As some of our result parsing code relies on this behavior FP4ClientUser::Message will append this newline character for now until the parsing code can be fixed.
- For now FP4ClientUser still overrides ::OutputInfo, ::OutputError and ::HandleError but only to add a checkNoEntry() to each one. This is so that we can confirm that there are no remaining uses of it before removing it entirely.
- All classes derived from FP4ClientUser have been updated to work with the changes. In some cases this meant changing the override of ClientUser::OutputInfo to ClientUser::Message.
-- With a little bit of work we could probably remove these derived classes now that FP4ClientUser supports capturing the info messages which would help simplify the code base however this should be done in a future work item.

### Misc
- Remove ::FPerforceSourceControlProvider::GetWorkspaceList rather than update it, as it is not used.
- Add FSourceControlResultInfo::HasErrors to check if the struct contains errors or not.
-- Did not replace existing use of FPerforceSourceControlProvider::ErrorMessages.IsEmpty() that should be done as it's own work item.

[CL 30208418 by paul chipchase in ue5-main branch]
2023-12-08 06:47:37 -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
wouter burgers
9dce208c39 UEFN / Skein: Fixed 'Sync To Latest' functionality moving the user out of their selected 'EditorMode' and losing a part of their progress, by disabling the SourceControl 'Check In Changes' and 'Sync Latest' buttons while an interactive tool is active.
#rb Jamie.Dale, Manuel.Lang, Marco.Anastasi
#rnx

[CL 30010665 by wouter burgers in ue5-main branch]
2023-11-30 03:37:36 -05:00
wouter burgers
e3cd7f6351 SourceControl: Fixed Content Browser not updating after reverting a Content Browser asset move to a subfolder along with any additional action that will trigger a world reload.
Technical:
- Moving an asset to a subfolder and choosing REVERT ALL works! The asset will show up again in Content Browser.
- Moving an asset to a subfolder, moving an actor (which triggers a world reload) and choosing REVERT ALL does NOT work! The asset will not show up again in Content Browser until the project is closed and re-opened. The reason it doesn't show up is because the AssetRegistry still thinks there is a REDIRECTOR asset in that location and the Content Browser doesn't show those by default.

The cause for this is that when the two packages (for example: a redirector material package and a world package) are passed into UPackageTools::ReloadPackages, it will call CreateNewMapForEditing which will cause the redirector material package to go STALE. This is tracked by FScopedTrackFilteredPackages. This results in the redirector material package never actually being reloaded, leaving the AssetRegistry with incorrect data, causing the Content Browser to not show it.

This is fixed by doing the world reload(s) separately.

#rb Manuel.Lang, Marco.Anastasi, Patrick.Enfedaque
#rnx

[CL 29916664 by wouter burgers in ue5-main branch]
2023-11-24 03:11:20 -05:00
wouter burgers
b1096cb5d0 Skein / ConflictUE: Enable conflict resolution workflow and remove the obsolete retrieval of asset list pre-pass.
If a conflict situation ever ends up blocking an internal developer (due to some unforeseen issue), the CLI command 'asset resolve conclude' can always get them out of it.

#rb Marco.Anastasi
#rnx

[CL 29884264 by wouter burgers in ue5-main branch]
2023-11-22 03:36:56 -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
marco anastasi
768aebf28f Added #if SOURCE_CONTROL_WITH_SLATE to SSourceControlControls Slate class in SourceControl module
#rb paul.chipchase

[CL 29864891 by marco anastasi in ue5-main branch]
2023-11-21 10:29:56 -05:00
marco anastasi
0eb858d5d9 * Created Snapshot History Tab structure
* Created Date Picker Widget
* Created Source Control Controls Widget
* Refactored Status Bar menu to use Source Control Controls Widget

#rb wouter.burgers, stuart.hill

[CL 29864023 by marco anastasi in ue5-main branch]
2023-11-21 09:56:04 -05:00
wouter burgers
2c9f7f0ffd SourceControl: Fixed crash when reverting a newly added level file along with a world reload that that causes the editor to crash.
#rb manuel.lang, marco.anastasi, patrick.enfedaque
[REVIEW]
#rnx

[CL 29641486 by wouter burgers in ue5-main branch]
2023-11-10 10:59:45 -05:00
wouter burgers
0aab06c19d SourceControl: Fixed world not reloading when an external object is reverted.
The existing code was specific to external Actors, but there are also external Objects, such as the folders created in the SceneOutliner. Previously, creating a folder in the SceneOutliner, saving it and reverting it would not trigger a world reload, incorrectly keeping the folder visible in the SceneOutliner.

#rb manuel.lang, marco.anastasi, patrick.enfedaque
#rnx

[CL 29639562 by wouter burgers in ue5-main branch]
2023-11-10 10:15:17 -05:00