Commit Graph

247 Commits

Author SHA1 Message Date
zach rammell
ea9c2dae18 View Changes: Only reregister components once when saving
#jira UE-181899
#rb ronald.koppers
#preflight 645c03848e01daf0e5bcc383

[CL 25416984 by zach rammell in ue5-main branch]
2023-05-10 17:14:13 -04:00
marco anastasi
d21b6c2cd0 Added ability to revert conflicted files in the Submit Files window.
A side effect of showing conflicted items greyed out in the Submit Files window is that the Revert operation is also disabled as greyed-out items are not selectable. This is not desirable as the user may well want to get out of a conflict situation by reverting the conflicted file and the submit dialog is a convenient place to do that.

#rb stuart.hill, manuel.lang
#preflight none

[CL 25333894 by marco anastasi in ue5-main branch]
2023-05-04 09:30:48 -04:00
wouter burgers
2f30b42b92 SkeinUE: When using the CHECK-IN CHANGES button, perform a SYNC first, as the API expects pull-before-push.
#preflight none

[CL 25282069 by wouter burgers in ue5-main branch]
2023-05-01 02:05:33 -04:00
zach rammell
0154b40c13 View Changes: Saving to changelists can now be canceled
#jira UE-181898
#rb ronald.koppers
#preflight 64485db8b208f61af8c02a52

[CL 25191943 by zach rammell in ue5-main branch]
2023-04-25 19:16:30 -04:00
zach rammell
5dd8f64ecb View Changes: Refresh active view when sorting columns
Previously only refreshed the changelist view

#jira UE-181901
#rb ronald.koppers
#preflight 644832fc864f15ebf5dbe7aa

[CL 25188908 by zach rammell in ue5-main branch]
2023-04-25 16:24:25 -04:00
zach rammell
93e73ed3cb View Changes: Prevent possible crashes when reverting
#jira none
#rb ronald.koppers
#preflight 644701be434155a8f85258aa

[CL 25173059 by zach rammell in ue5-main branch]
2023-04-24 18:44:23 -04:00
jamie dale
933348f856 Use the FMessageDialog overloads that pass the optional title by-value
#jira
#rb none
#rnx

[CL 25062589 by jamie dale in ue5-main branch]
2023-04-15 19:49:32 -04:00
marco anastasi
f6978a065c Created new Source Control feature flag UsesSnapshots() to solve inconsistency in use of UsesChangelists() and UsesFileRevisions() causing issues for git Source Control Provider
* Option to check in an asset from the Content Browser Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to check in an asset from the Scene Outliner Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Ability to uncheck files in the Submit Files Window is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to revert the writable flag on an asset in the Content Browser Source Control Context Menu is now enabled if the SCC uses checkout instead of if it uses File Revisions (like the 'Make Writable' option)

#jira UCS-6630
#rb brooke.hubert, wouter.burgers
#lockdown jeanmichel.dignard
#preflight 640e6b41482188d710ff8316

[CL 24724061 by marco anastasi in ue5-main branch]
2023-03-20 17:20:41 -04:00
wouter burgers
1f3f797346 SourceControl: Revert individual added non-package filse in check-in window sometimes does not work.
#preflight none

[CL 24646650 by wouter burgers in ue5-main branch]
2023-03-14 18:59:26 -04:00
wouter burgers
d59c4daedc SourceControl: Refactored 'revert unsaved' behavior to be consistent in SceneOutliner and ContentBrowser, following #23845005.
- Can be enabled/disabled via cvar (default disabled, enabled in Skein).
- Can revert unsaved in ContentBrowser (=new)
- Can revert unsaved in SceneOutliner (=existing)

#preflight 641059120e1f02786b3dd9ee

[CL 24636117 by wouter burgers in ue5-main branch]
2023-03-14 11:07:11 -04:00
Patrick Laflamme
3ba42cf0e5 Fixed missing '#changelist validated' tag when submitting without editing the changelist text.
#jira UE-179855 - Validation system is Failing to Append '#changelist validated' Tag in CL Description
#rb Brooke.Hubert
#preflight 640f28c4af3fc35292b3b252

[CL 24634288 by Patrick Laflamme in ue5-main branch]
2023-03-14 09:27:26 -04:00
wouter burgers
7403ba2cf4 SourceControl: After reverting all files in the 'Submit Files' dialog, close it.
#preflight none

[CL 24557400 by wouter burgers in ue5-main branch]
2023-03-08 06:19:24 -05:00
marco anastasi
0f5a4e5481 Add support for cherry picking an asset from the asset history dialog, using Tool Menus
#rb wouter.burgers, brooke.hubert
#preflight 640795242559570cc7f6705b

[CL 24557170 by marco anastasi in ue5-main branch]
2023-03-08 05:40:18 -05:00
wouter burgers
ee0bc4b3f4 SourceControl / UEFN: Hide UEFN 'Revert' functionality behind cvars.
#preflight none
#preflight 640841a4827cf9251bf9f30d

[CL 24556839 by wouter burgers in ue5-main branch]
2023-03-08 05:01:20 -05:00
jordan hoffmann
f46746f35f [CrashFix] Fix Dereference Null
#rb trivial
#pf none

[CL 24456485 by jordan hoffmann in ue5-main branch]
2023-02-28 20:40:09 -05:00
jordan hoffmann
5abf21121d [BugFix] Modified actors are not diff'ing correctly with one file per actor
#rb dan.oconnor
#rb francis.hurteau

[CL 24451087 by jordan hoffmann in ue5-main branch]
2023-02-28 16:07:32 -05:00
lauren barnes
d36592a0cc Create revision control context object for menu creation
[REVIEW] [at]wouter.burgers, [at]zach.rammell
#preflight 63f56e1791018822cc2f9055
#jira UE-178131
#rb Wouter.Bougers, Marco.Anastasi, Zach.Rammell

[CL 24371853 by lauren barnes in ue5-main branch]
2023-02-22 17:56:16 -05:00
christian savoie
5d51c65f1f Auto select items in revert window to reduce redundant actions for users.
#tests used menu to revert assets

[CL 24287015 by christian savoie in ue5-main branch]
2023-02-17 13:47:56 -05:00
zach rammell
f1c0db9cb8 Disallow unsaved changes to be discarded from unsaved levels.
This previously resulted in the level being deleted irreversibly.

#jira UE-169781
#rb brooke.hubert, ronald.koppers
#lockdown jeanmichel.dignard
#preflight 63ebff59514832b24268590f

[CL 24224931 by zach rammell in ue5-main branch]
2023-02-14 20:25:02 -05:00
Joe Kirchoff
c1f997087d Fix remaining UnrealGame Win64 V3 pathing issues
#rnx
#rb trivial
#preflight 63ec10e47e76998e9afe7aa7

[CL 24222870 by Joe Kirchoff in ue5-main branch]
2023-02-14 18:12:00 -05:00
lauren barnes
b254a402bd Change to capture weak pointer to the revision control UI in the dynamic menu entry.
#rb JeanMichel.Dignard
#preflight 63e426dbea7ad686983b4f6f

[CL 24092965 by lauren barnes in ue5-main branch]
2023-02-09 00:36:32 -05:00
wouter burgers
0aa122ff5c SourceControl: Added notification if sync fails when getting latest, similar to the warning shown by FSourceControlWindows::PromptForCheckin for checkin fails.
In addition, I refactored AssetViewUtils::SyncPathsFromSourceControl somewhat.
- Added alternative (preferred) way to get affected files/packages using the FSyncPreview operation as opposed to querying the AssetRegistry.
- Added support for hot reloading the world if one of its external packages (actor/object) got synced so those changes are reflected in the viewport.
- Added support for passing in either content paths or absolute paths to sync.

- Deprecated the 'bIsSyncLatestOperation' parameter from SyncPackagesFromSourceControl.

Note that SyncPackagesFromSourceControl now has a single internal caller (FAssetSourceControlContextMenuState::ExecuteSCCSync).
Note that SyncPathsFromSourceControl now has a single internal caller (FSourceControlWindows::SyncLatest).

[REVIEW]
#preflight 63e3a014244dc45a201c918d

[CL 24074948 by wouter burgers in ue5-main branch]
2023-02-08 12:17:26 -05:00
marco anastasi
0e8453ff5e Added context menu option to revert assets in the submit changes dialog
#preflight 63dcf50478716a01e80bc3b8
#rb wouter.burgers, stuart.hill, brooke.hubert
[FYI] manuel.lang, jeansebastien.guay

[CL 24051196 by marco anastasi in ue5-main branch]
2023-02-07 12:07:01 -05:00
lauren barnes
ad3e6dd345 Converting Revision Control History window to use UToolMenu for its context menu
#rb Aditya.RaviChandran, Zach.Rammell
#preflight 63e13111b923ed4bddf04af6

[CL 24035663 by lauren barnes in ue5-main branch]
2023-02-06 14:21:35 -05:00
wouter burgers
192829d351 SourceControl: Refactored UsesCustomProjectDir / GetSourceControlLocations usage pattern.
[CL 23965223 by wouter burgers in ue5-main branch]
2023-02-02 03:44:18 -05:00