302 Commits

Author SHA1 Message Date
eric boucher
70ad2bf9c6 Added a SetQuiet boolean to FGetFileList Source Control Operation to be able to prevent messages "... - no such file(s)." from generating errors in the logs.
#jira UE-216348
#rb wouter.burgers

[CL 35977637 by eric boucher in ue5-main branch]
2024-09-03 15:36:14 -04:00
eric boucher
ef71ea2b5b New localization option to move localized variants alongside source asset in the content browser and another one to detect if those localized variants are only in Revision Control:
- Project Settings / Editor / Assets / Internationalization / Rename Localized Variants Alongside Source Asset (defaults to: true)
 - Project Settings / Editor / Revision Control / Internationalization / Requires Revision Control to Rename Localizable Assets (defaults to: false) (works only with Perforce)

#jira UE-216348
#rb Jamie.Dale, wouter.burgers
[RN]

[CL 35804579 by eric boucher in ue5-main branch]
2024-08-26 14:02:18 -04:00
paul chipchase
4757e2d444 The 'Revision Control Login' dialog will now immedately save revision control settings to disk when either 'accept' or 'disable' buttons are selected.
#rb dan.oconnor, wouter.burgers
#jira UE-221266

- Previously we only saved the settings when the editor shutdown or an unrelated full flush of the config file system was triggered elsewhere. People often found this confusing as they would set up their editor with a revision control setting only to find that it was no longer set if the editor process crashed or was terminated by a code debugger etc./
- Now we immediately flush our settings to disk once the user has accepted the new settings or opted to disable revision control entirely.
- Fixed SOURCE_CONTROL_WITH_SLATE to cover the entire .cpp and .h file, none of the code that was outside of these pre-existing scopes is required when SOURCE_CONTROL_WITH_SLATE == 0.

[CL 35559000 by paul chipchase in ue5-main branch]
2024-08-15 06:15:26 -04:00
luke thatcher
5e8aaf2a97 Remove RHIBeginFrame
- We now only have RHIEndFrame to mark the boundary between engine frames for the purpose of stat gathering and RHI cleanup tasks. The next frame begins immediately after the EndFrame command.
 - RHIEndFrame is called on the RHI thread after all prior command list submissions. Platform RHIs that need to enqueue RHICmdList work can override RHIEndFrame_RenderThread to add this work either side of the actual EndFrame command.
 - The work that platform RHIs performed in RHIBeginFrame has been merged into their implementations of RHIEndFrame.

#rb mihnea.balta
#jira UE-177299

[CL 35106431 by luke thatcher in ue5-main branch]
2024-07-26 08:22:50 -04:00
bob tellez
9fe87294bf #UE Fix CheckOutOrAddFiles so it works in the common case of a file just being in the depot and not checked out
[CL 34938342 by bob tellez in ue5-main branch]
2024-07-19 14:00:14 -04:00
wouter burgers
dc628d3f06 RevisionControlStyle: Fixed discrepancy between '+' sign color in Snapshot History assets row and SceneOutliner for 'added' files.
#rb federico.lopez, Stuart.Hill

[CL 34733181 by wouter burgers in ue5-main branch]
2024-06-28 03:22:02 -04:00
andrea botti
ae157294a5 [SourceControl] Delete of file that is not at latest fails silently and removes the entry from content browser
#rb wouter.burgers
#jira UE-201031

[CL 34642482 by andrea botti in ue5-main branch]
2024-06-25 10:55:58 -04:00
wouter burgers
1112ea161a Skein / SnapshotHistory: Added snapshot content details tooltip on hovering over the number of affected files in a snapshot.
#rb federico.lopez, Stuart.Hill

[CL 34255403 by wouter burgers in ue5-main branch]
2024-06-10 17:53:52 -04:00
dave belanger
df4bca31d8 [UEFN] Support multiple projects on the same perforce workspace
Put guardrails against using URC with multiple projects because it's not supported
#rb wouter.burgers

[CL 34127677 by dave belanger in ue5-main branch]
2024-06-05 12:05:35 -04:00
wouter burgers
ee4e44ae78 Skein / SnapshotHistory: Icon Update.
#rb Manuel.Lang

[CL 33888567 by wouter burgers in ue5-main branch]
2024-05-24 04:02:05 -04:00
sergio gardeazabal
a3b9a960bb Skipping Asset Data Update on the source control module when a actor label is changed if its pacakge is transient.
Some tools like the Chaos Visual Debugger need to spawn a large number of transient actors, which will result in actor label creations which becomes expensive due to that asset data update attempt. Transient packages cannot be sabed, therefore we can safely skip the update in the source control module for them.

#jira UE-189695
[FYI] wouter.burgers
#tests Tested in the editor that if I change the label of any actor in a saved map, the code to update the assed data cache is still called. But if the actors are from a transient world (like in the Chaos Visual Debugger) the update is no longer executed (as expected).

[CL 33563896 by sergio gardeazabal in ue5-main branch]
2024-05-09 19:23:14 -04:00
christian savoie
96154163d5 Add Revision Control option to copy remote paths
* Fix mixed file/folder selection to properly resolve all items in selection
* Fix revert writable to use filtered file list instead of full file list.
* Expose the number of paths required to trigger user dialog about large operations so it can be customized per operation

#tests Tested copy remote paths action with files, folders and a mix, including local only files
[REVIEW] [at]aditya.ravichandran [at]Julien.StJean [at]lauren.barnes
#rb brooke.hubert, wouter.burgers

[CL 33533507 by christian savoie in ue5-main branch]
2024-05-08 18:57:35 -04:00
wouter burgers
479acf7cdf SourceControl: Fixed hitch caused by conflict remaining/upcoming scanning in large repositories.
Instead of scanning the cache in its entirity (twice!) on every source control status cache, the Skein provider now keeps track of remaining/upcoming conflicts incrementally as new source control statuses come in.

#jira UE-213176
#rb Manuel.Lang

[CL 33300055 by wouter burgers in ue5-main branch]
2024-04-29 10:22:55 -04:00
jurre debaare
672d57ae07 - Added helper scope-object to handle Rename operations for (generic) external packages/objects (similar to world/level behaviour)
- Added helper function to handle Duplication of external packages (replaced ULevel behaviour)
- Added FExternalAssetDependencyGatherer to handle external packages used by Asset Migration
- Also DetachLinker for external objects not part of a UWorld when doing a reload
#rb Matt.Peters, Patrick.Enfedaque, Richard.Malo

[CL 33295840 by jurre debaare in ue5-main branch]
2024-04-29 05:02:20 -04:00
wouter burgers
becd423b59 SourceControl: Fixed 'Sync' option not displaying in the status bar.
I wasn't actually able to reproduce the issue, but I did find some oddities regarding the visibility of the checkin/sync/restore buttons. For example: if Skein is 'unavailable', the checkin/sync buttons would be hidden but the restore button could be available. I also made the buttons more explicitly tied to Skein to avoid them showing up using Git/Perforce.

#rb Marco.Anastasi

[CL 33265056 by wouter burgers in ue5-main branch]
2024-04-26 11:10:13 -04:00
aditya ravichandran
cff3fd1290 Revision Control: Update color for marked for add icon to accent blue
#rb Brooke.Hubert

[CL 33027535 by aditya ravichandran in ue5-main branch]
2024-04-16 23:13:33 -04:00
paul chipchase
4cf57d2d1e Extend FSourceControlInitSettings to allow the caller to control if a provider uses values parsed from the commandline or not when initializing.
#rb Juan.Legaz
#jira UE-212182
#rnx

- We default to the old behavior, so that the default way of creating a source control provider (no FSourceControlInitSettings) will read all of the commandline parameters available and the newer way (creating a provider with a FSourceControlInitSettings) will ignore the commandline.

[CL 33001499 by paul chipchase in ue5-main branch]
2024-04-16 11:05:04 -04:00
sebastien lussier
e477d28888 Source Control - File Status Monitor: Prevent crash when accessing Slate in unattended apps
[CL 32777117 by sebastien lussier in ue5-main branch]
2024-04-05 18:39:02 -04:00
wouter burgers
efedf89bd1 Skein / ViewportStatus: Update iconography again with latest icons/colors received on Slack.
[FYI] manuel.lang

[CL 32737147 by wouter burgers in ue5-main branch]
2024-04-04 14:41:22 -04:00
wouter burgers
758113aa94 Skein / ConflictUE: Update primary URC buttons with conflict icons when a user saves changes to a file that we know is out of date.
#rb Manuel.Lang

[CL 32615215 by wouter burgers in ue5-main branch]
2024-03-29 11:45:26 -04:00
wouter burgers
8461964176 Skein / ViewportStatus: Integrate editor team work for Viewport Status Highlighting with UCS work.
#rb Manuel.Lang

[CL 32611700 by wouter burgers in ue5-main branch]
2024-03-29 07:24:47 -04:00
marco anastasi
46168a0105 Warn the user with a confirmation dialog if the revision control provider is changed/disabled
#rb wouter.burgers

[CL 32432617 by marco anastasi in ue5-main branch]
2024-03-22 10:11:07 -04:00
josh adams
554a1b56b6 [Backout] - CL32203634
[FYI] bob.tellez
Original CL Desc
-----------------------------------------------------------------
[Backout] - CL32181613
[FYI] Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Fixing a bug where two branches for SourceControlSettings (project vs engine-only) would re-use one of the branches, instead of loading it a second time (so FIndBranch() will now check the FIlename if appropriate)
- Added support in FConfigContext for contexts that empty out the PRojectConfigDir to only load Engine ini layers
#rb paul.chipchase

[CL 32254428 by josh adams in ue5-main branch]
2024-03-14 15:05:16 -04:00
bob tellez
32b56658dd [Backout] - CL32181613
[FYI] Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Fixing a bug where two branches for SourceControlSettings (project vs engine-only) would re-use one of the branches, instead of loading it a second time (so FIndBranch() will now check the FIlename if appropriate)
- Added support in FConfigContext for contexts that empty out the PRojectConfigDir to only load Engine ini layers
#rb paul.chipchase

[CL 32203657 by bob tellez in ue5-main branch]
2024-03-13 00:39:01 -04:00
josh adams
4b264b5df5 - Fixing a bug where two branches for SourceControlSettings (project vs engine-only) would re-use one of the branches, instead of loading it a second time (so FIndBranch() will now check the FIlename if appropriate)
- Added support in FConfigContext for contexts that empty out the PRojectConfigDir to only load Engine ini layers
#rb paul.chipchase

[CL 32181639 by josh adams in ue5-main branch]
2024-03-12 11:40:54 -04:00