Commit Graph

36 Commits

Author SHA1 Message Date
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
92e74b4c79 Skein / Snapshot History: Add 'View Snapshot History' menu item to Revision Control menu in Status Bar.
#rb Marco.Anastasi
#rnx

[CL 30012929 by wouter burgers in ue5-main branch]
2023-11-30 07:58:07 -05:00
benoit chauvin
5f4e27ed26 New Delegate to override the submit functionality for the Source Control Changelist window and the Source Control Window.
This new delegate give users the capability to intercept and handle the submit instead of the regular flows.
Depending on the reply from the delegate the current flow will be:
- interrupted if the submit is handled by the delegate
- interrupted and set to fail state if the delegate returns an error
- continued if the delegate cannot handle the current source provider

#rb Stuart.Hill, brooke.hubert, Patrick.Enfedaque

[CL 28533359 by benoit chauvin in ue5-main branch]
2023-10-06 04:38:12 -04:00
jordan hoffmann
2b08e650c7 [CDPR] Added more information about changelist to source control changelists window context menu
+ Expand source control menu context with selected changelist,
+ Expose information about if changelist is default and its source control specific identifier,

#rb Patrick.Enfedaque, Patrick.Laflamme, zach.rammell
#preflight skip
#p4v-cherrypick 25526575
#preflight 64665919b91ab13b09c2089c

[CL 25528171 by jordan hoffmann in ue5-main branch]
2023-05-18 13:20:35 -04: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
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
marco anastasi
b29f599449 * Refactored Sync Latest operation to improve performance
* Sync Latest no longer listing and reloading all packages when the source control provider provides a sync preview functionality. When a Sync Preview is available, Sync Latest unloads only the files that are going to be overwritten by the sync operation, and then reloads them and the world

* Refactored Revert All operation to improve performance
* Revert All no longer lists and reloads all packages when the source control provider provides a sync preview functionality. Instead it unloads only the files that may be overwritten by the revert operation (i.e. submittable files), and then reloads them and the world
* Replaced RevertAndReloadAllPackages with RevertAndReloadWorld, no longer listing and reloading all packages (see https://p4-swarm.epicgames.net/reviews/23244245/)

This review is a combination of the two archived reviews https://p4-swarm.epicgames.net/reviews/23736137 and https://p4-swarm.epicgames.net/reviews/23736282

#rb wouter.burgers, stuart.hill, brooke.hubert, francis.hurteau
#preflight 63c9c7786a00f3cc8ead6779

[CL 23796067 by marco anastasi in ue5-main branch]
2023-01-20 15:31:16 -05:00
marco anastasi
d28eb652fb Implemented Asset Revert functionality from Scene Outliner.
Fixed 'Cannot revert umaps with Skein' by reloading all assets when attempting to revert a map
Implemented 'Revert All' button

#rb patrick.enfedaque, wouter.burgers, stuart.hill, manuel.lang
[FYI] francis.hurteau, brooke.hubert
#preflight 6388f51d4c3ce8ae5dbfb18f

#preflight 639340545c5308d18c28b967

[CL 23475314 by marco anastasi in ue5-main branch]
2022-12-11 23:09:22 -05:00
wouter burgers
1161fdcd00 SourceControl / UEFN: Get latest on project with the shortcut F5.
This introduces a MainFrame menu item under TOOLS -> SOURCE CONTROL called 'Sync Content', similar to the existing 'Submit Content' option. The new menu item is tied to the F5 hot key.

#preflight 63722efcb6636838285ea216

[CL 23129394 by wouter burgers in ue5-main branch]
2022-11-14 18:26:11 -05:00
clint levijoki
baa43a500d Added an editor project option to hide the 'Submit Content' menu action. This menu item is unwanted in some projects as it's not running any validation before submitting.
#preflight 63484914ce524ed356914926
#preflight 6349b46fa8717e9453e14b0b

[CL 22547966 by clint levijoki in ue5-main branch]
2022-10-15 02:16:54 -04:00
patrick enfedaque
3efc94dd9d SceneOutliner:
- SCC Show in changelist
- Fix Unloaded actors not having SCC Menu

#jira UE-155244
#rb patrick.laflamme
#preflight 630ca346f92416fb925faead

[CL 21685112 by patrick enfedaque in ue5-main branch]
2022-08-29 14:51:36 -04:00
patrick enfedaque
2d8d4adaa3 SourceControlWindowExtender: Extends functionality of the SourceControlWindows window
Actor: Focus, Pin, Select
Assets: Browse To

#jira UE-155245
#rb patrick.laflamme, richard.malo
#preflight 630796aa0968fbaf691de565

[CL 21590365 by patrick enfedaque in ue5-main branch]
2022-08-26 11:04:20 -04:00
luc eygasier
d6b8aa4536 Adds "Delete new files on revert" option for Source Control
Prevents Uncontrolled Changelist's UpdateStatus usage to pollute the error logs.

#jira UE-140095
#rb JeanFrancois.Dube
#preflight 61f44e47801201ab3894f020

#changelist validated

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 18796586 in //UE5/Release-5.0/... via CL 18797752 via CL 18798475
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18798602 by luc eygasier in ue5-main branch]
2022-01-31 17:03:09 -05:00
luc eygasier
18edf5ba3d Adds validation tag in changelist description.
#rb Sebastien.Lussier

#changelist validated

[CL 16051226 by luc eygasier in ue5-main branch]
2021-04-19 11:21:23 -04:00
patrick enfedaque
925afa781b SourceControl: Replace main menu "Submit" menu with "View Changelists..."
#rb sebastien.lussier

#ROBOMERGE-SOURCE: CL 15725157 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15727212 by patrick enfedaque in ue5-main branch]
2021-03-17 13:43:31 -04:00
julien lheureux
a460459eed Added possibility to get asset data from history, with a max fetch size (until we have a better solution)
Changed the way we associate shelved files with their local filename to facilitate mapping (perforce operations)
Implemented what was needed on the SCC side to support diff against shelve
Improved way we display object names for deleted & shelved files

#rb sebastien.lussier

[CL 15356101 by julien lheureux in ue5-main branch]
2021-02-08 09:36:20 -04:00
julien lheureux
7660280730 Added ActorLabel tag for actors using WP
Used the ActorLabel tag to obtain a better name in changelists dialog

#rb sebastien.lussier, jeanfrancois.dube

[CL 15166658 by julien lheureux in ue5-main branch]
2021-01-22 16:21:29 -04:00
julien lheureux
8d3734f953 Added contextual menu options for file actions (diff agains depot, show history, locate file)
Better cleanup in perforce revert operation
Made revert work on changelists
Fixed issue where no changelists would be displayed if the default changelist was empty.

#rb sebastien.lussier

[CL 15138037 by julien lheureux in ue5-main branch]
2021-01-19 14:50:23 -04:00
Sebastien Lussier
44a5a5addf Changelist Window initial implementation
#rb julien.lheureux

[CL 15041426 by Sebastien Lussier in ue5-main branch]
2021-01-11 15:31:58 -04:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
Jamie Dale
855fad9cd0 Updated "Submit to Source Control" to include plugin content
#jira UE-83249
#rb Matt.Hoffman

[CL 10061814 by Jamie Dale in Dev-Editor branch]
2019-11-06 17:10:47 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Marc Audy
d90da4ab1a Merge to Dev-Main for 4.20 @ 4090813
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
2018-05-23 21:04:31 -04:00