Commit Graph

159 Commits

Author SHA1 Message Date
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
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
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
wouter burgers
ddaa200319 SourceControl: Added cvar to force the modal dialog to always show up as a modal dialog, ignoring the preference of the calling code.
#preflight 64102f84c41a0a2a77063d17

[CL 24633200 by wouter burgers in ue5-main branch]
2023-03-14 07:39:31 -04: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
wouter burgers
09ca92480b SourceControl: Fixed inconsistent results when reverting asset in 'Submit Files' dialog.
#preflight none

[CL 24541931 by wouter burgers in ue5-main branch]
2023-03-07 11:59:14 -05: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
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
wouter burgers
acd14248c8 SkeinUE: Rename 'Skein' to 'Unreal Revision Control' in the revision control dropdown.
Tricky bit is to ensure that we're backwards compatible for projects with SourceControlSettings saved on disk/cloud that reference 'Skein' now use 'Unreal Revision Control' instead.

#preflight 63ea2830923476b686c42d22

[CL 24174383 by wouter burgers in ue5-main branch]
2023-02-13 10:02:20 -05:00
wouter burgers
1d6ef4b2e3 SourceControl: Added CanExecuteOperation to ISourceControlProvider interface.
#preflight 63de1752fe33a06594fc2e02

[CL 24018386 by wouter burgers in ue5-main branch]
2023-02-04 10:54:03 -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
zach rammell
1edfb3ed31 Unsaved Assets in Changelist Window
#jira UE-169781
#preflight 63d4247a5354589b5c022e4c
#rb brooke.hubert
#lockdown jeanmichel.dignard

[CL 23923988 by zach rammell in ue5-main branch]
2023-01-31 01:26:50 -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
stuart hill
d8b31f7ed0 Add a flag to the source control provider to tell us if 'uncontrolled' changelists are supported.
#rb Marco.Anastasi, zach.rammell
#prelight 6398633f8c5081ee9a275f20

[CL 23499875 by stuart hill in ue5-main branch]
2022-12-13 18:18:02 -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
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
richard malo
27956d595f Avoid getting spam warnings coming from world outliner usaved column trying to resolve actor memory package path when running PIE.
#rb jeanfrancois.dube
#preflight 6386298df213a116eb293e15

[CL 23312521 by richard malo in ue5-main branch]
2022-11-29 12:35:57 -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
henrik karlsson
fa90b399a4 Added includes for future change. This changelist only contains added #include and a couple of empty placeholder files
Tested compiling fortnite, unrealeditor, lyra, qagame with non-unity/pch

#preflight 63635997876630122adeab9f
#rb none

[CL 22958990 by henrik karlsson in ue5-main branch]
2022-11-03 14:18:47 -04:00
patrick laflamme
c710b14d86 Optimized the source control changelist to more efficienty update the list of source controlled files to monitor.
- Added function to the source control file status monitor to easily set the exact list of file to monitor efficiently
Fixed the source control changelist not monitoring all the files in view.

#rb Aditya.Ravichandran
#preflight 6362b9bf1a32af63a8f5b719

[CL 22937889 by patrick laflamme in ue5-main branch]
2022-11-02 23:06:17 -04:00
stuart hill
1fc502d9b1 Give the option to disable being able to diff files in the Source Control Submit Widget. To allow this, AllowsDiffAgainstDepot function should return false.
#preflight 6360fd498768c5532f5425f0
#rb Marco.Anastasi, Patrick.Laflamme

[CL 22888653 by stuart hill in ue5-main branch]
2022-11-01 15:09:57 -04:00
patrick laflamme
dd7503e556 Reduce a check to an ensure, as we are aware of some cases files are dirtied off the main thread.
This is a temporary stop gap until a better fix can be put in for the offending assets in a future release, and it is not intended for assets to dirty off the main thread.

#rnx
#rb Brooke.Hubert
#jira UE-168825 - Crash opening skeletal mesh
#preflight 636040b766696ca050787cbc

[CL 22876436 by patrick laflamme in ue5-main branch]
2022-10-31 21:22:58 -04:00
patrick laflamme
3d0ecd8bed Fixed possible out-of-memory issue with the FSourceControlFileStatusMonitor reserving -1 items in an array.
- Fixed an issue that didn't correctly account the number a pending files to check when source control provider changed.
  - Added check to be sure the monitor is called on the main thread.

#rb Patrick.Enfedaque
#preflight 6357df4e36767b3e1e62c9ee

[CL 22792937 by patrick laflamme in ue5-main branch]
2022-10-26 17:29:44 -04:00