Commit Graph

28 Commits

Author SHA1 Message Date
marco anastasi
ba94a69dbb Implemented auto-save on check-in.
Fixed issue that prevented deleted objects from being restored on Revert All
As a collateral, fixed issue that caused not saving deleted files during Delete workflow to result in errors after sync
As a collateral, fixed issue that caused added and saved files to disappear after Sync Latest

#rb wouter.burgers, stuart.hill
[FYI] brooke.hubert, manuel.lang
#preflight 63ed15e5c9692d7c04ea4188

[CL 24251962 by marco anastasi in ue5-main branch]
2023-02-16 02:09:33 -05:00
zach rammell
bdc16077f3 View Changes UI visual improvements
- Side panel no longer compressed
- Name changed to "View Changes"

#jira UE-175840
#rb ronald.koppers
#preflight 63daeceb4965eb8c33d456e5
#lockdown jeanmichel.dignard

[CL 23961626 by zach rammell in ue5-main branch]
2023-02-01 19:44:37 -05:00
stuart hill
df6df596f7 Ensure the camera does not reset when we are syncing or reverting a file or all files via source control
A scoped class is added to retain and restore all camera views which is used when we reload or sync packages.

#preflight 63d2766de55deff624ed1b5a

[CL 23867883 by stuart hill in ue5-main branch]
2023-01-26 10:15:04 -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
wouter burgers
08afa95f86 SourceControl: Fixed clicking 'X' or 'Esc' on the 'Revert All' confirmation modal not resulting in the cancellation of the operation.
#preflight none

[CL 23795959 by wouter burgers in ue5-main branch]
2023-01-20 15:27:17 -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
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
aditya ravichandran
f8b7ee5555 Replace any instances of "Source Control" with "Revision Control" in text in the Editor
#rb JeanMichel.Dignard, Robb.Surridge
#preflight 637d180efa348e8480e8837e

[CL 23250808 by aditya ravichandran in ue5-main branch]
2022-11-23 11:57:50 -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
marco anastasi
7aabc49afb Swapped positions of Sync Latest and Check-in Changes Status Bar buttons
#rb none
[FYI] wouter.burgers, garren.gotthardt
#preflight none

[CL 22879502 by marco anastasi in ue5-main branch]
2022-11-01 07:01:53 -04:00
marco anastasi
43ed4ef8ac Fixed: Cannot get latest when there is a conflicting change
#rb stuart.hill
#preflight 63567e16ae33b04ec1c8bf9d

[CL 22787065 by marco anastasi in ue5-main branch]
2022-10-26 15:30:49 -04:00
henrik karlsson
b5b86c796c This change is a strategical submit for a coming change that removes lots of includes in headers that are included by many files. This change contains adding of includes in files that previously got those includes transitively from other inclkudes
#preflight 6355d4940313c24974b2107b
#rb none

[CL 22783162 by henrik karlsson in ue5-main branch]
2022-10-26 12:57:32 -04:00
marco anastasi
8c78d7e420 Renamed 'Get Latest' status bar button to 'Sync Latest'
[FYI] wouter.burgers

[CL 22707964 by marco anastasi in ue5-main branch]
2022-10-21 22:28:33 -04: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
wouter burgers
06e382301f SourceControl / UEFN: Fixed ListAllPackages only working if ISourceControlModule::GetSourceControlProjectDir() is non-empty.
[FYI] dave.belanger, marco.anastasi, stuart.hill
#preflight none

[CL 22390210 by wouter burgers in ue5-main branch]
2022-10-06 20:59:43 -04:00
patrick laflamme
068b6058ab Implemented the 'Unsaved' Editor status bar button that displays the number of unsaved assets (dirty packages) the user and potential warnings with respect to the source control those asset may have.
- Implemented the UnsavedAssetTrackers plugin and enabled it by default.
  - Added the 'Unsaved' button to the Editor taskbars to display the number of unsaved packages along with a warning icon if warning are associated with one of the unsaved files.
  - Updated the 'Save Content' package to display warnings if one of the packages has warnings.
  - Added a class to monitor and periodically update the source controlled status of a collection of files/packages.
  - Changed the default value of PromptForCheckoutOnAssetModification settings to False because the Unsaved button flow is complementary (and the popup was noisy for OFPA users).
  - Updated the changelist window to use the soure control file status monitor.

#jira UE-163734 - Implement the 'Unsaved' Editor Taskbar Button
#rb Patrick.Enfedaque
#preflight 633ae915b12b8af5fde80f7c

[CL 22322224 by patrick laflamme in ue5-main branch]
2022-10-03 20:38:09 -04:00
marco anastasi
321550bb33 Made 'Submit Changes' button invisible for Skein
#rb wouter.burgers, stuart.hill, patrick.laflamme
#preflight none

[CL 22279723 by marco anastasi in ue5-main branch]
2022-09-30 16:16:47 -04:00
marco anastasi
dd01cd42b5 Create shortcut buttons in Status Bar for Skein operations
#rb wouter.burgers, patrick.laflamme
#preflight 63301d3d665f6b8f7fab0066


RESOLUTION: Resolved conflict with IsAtLatestRevision() and GetNumLocalChanges()

[CL 22193646 by marco anastasi in ue5-main branch]
2022-09-26 16:32:49 -04:00
patrick laflamme
e6e6156d0f Displayed the type of actor in the 'Check Out Files' dialog rather than just displaying "Actor".
- The type displayed is consistent with the type displayed in the 'Changelists' window.

Removed the 'Off' from 'Source Control Off' on the tool bar because the icon and the text color are enough.

#jira UE-155247 - Show the type of actors being checked out in the "Check Out Assets" window.
#rb Patrick.Enfedaque
#preflight 6324785f5f55ba280e0a3567

[CL 22052349 by patrick laflamme in ue5-main branch]
2022-09-16 12:47:43 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
leon huang
0193ffe8d3 Fix for CIS warnings for localization duplicate keys. Fixes simply involve changing one of the colliding localization keys.
#rnx
	#rb: Vincent.Gauthier
	#jira: UE-143620
	#preflight: 6222489d2f7d78332e121416
	#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: leon.huang
#ROBOMERGE-SOURCE: CL 19272838 in //UE5/Release-5.0/... via CL 19273134
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19275063 by leon huang in ue5-main branch]
2022-03-04 16:10:23 -05:00
Luc Eygasier
84ac733e6b Adds Submit Content menu entry.
Moves Source Control related actions to Tools menu.

#rb Sebastien.Lussier
#jira UE-117782, FORT-415499
#p4v-cherrypick 17872483

#changelist validated

[CL 17876035 by Luc Eygasier in ue5-main branch]
2021-10-20 14:15:53 -04:00
Rex Hill
0decac9e17 Fix source control submenu not updating each time menu is opened
#jira UE-116554
#rb luc.eygasier
#fyi matt.kuhlenschmidt

[CL 16488282 by Rex Hill in ue5-main branch]
2021-05-27 13:50:26 -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
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