Commit Graph

13 Commits

Author SHA1 Message Date
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
luc eygasier
5395c37c90 Adds mark for delete files support for Uncontrolled Changelist
#rb JeanFrancois.Dube
#jira UE-140467
#preflight 61f93d89c54b18c42dd34922

#changelist validated

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

[CL 18823271 by luc eygasier in ue5-main branch]
2022-02-02 05:30:58 -05:00
matija kecman
c77447d771 UnrealEd: Fix warning complaining about GetLocalFullPath being called on FPackagePath with an unspecified header extension for a path that does not exist on disk. Partially addresses jira UE-137902
Warnings were generated when converting brushes to static meshes, creating geometry collections from static meshes in fracture mode and one instance also occured while loading assets on QAGame startup

#rnx
#rb matt.peters, luc.eygasier
#jira UE-137902
#preflight 61ee7d55ef289ffc6ddfd1ed

#ROBOMERGE-AUTHOR: matija.kecman
#ROBOMERGE-SOURCE: CL 18706982 in //UE5/Release-5.0/... via CL 18706989 via CL 18707053
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18707056 by matija kecman in ue5-main branch]
2022-01-24 06:32:49 -05:00
luc eygasier
947fa7bf12 Prevent saved file to be added to PackagesNotToPromptAnyMore when added to UncontrolledChangelist.
Allows save window to be displayed again if a file is reverted in UncontrolledChangelist.

#jira UE-136350
#rb Sebastien.Lussier
#robomerge Release-5.0

#changelist validated

[CL 18431729 by luc eygasier in ue5-main branch]
2021-12-10 12:39:11 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
luc eygasier
6b48cf46da Removes abusive Uncontrolled Changelist warning. Replaced by display log when loading performed as expected.
#rb Sebastien.Lussier
#jira UE-131858, UE-131040

#changelist validated

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 17884337 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v883-17842818)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17884356 by luc eygasier in ue5-release-engine-test branch]
2021-10-21 09:53:24 -04:00
luc eygasier
9f354adce4 Use AssetRegistry to add writable files to Reconcile cache.
Adds UncontrolledChangelistValidator, reconciling writable assets, warning the user if new uncontrolled changes are found during changelist validation

#rb Sebastien.Lussier
#preflight 60d0965a367e6700013a0083

#changelist validated

#ROBOMERGE-SOURCE: CL 16728469 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16728483 by luc eygasier in ue5-release-engine-test branch]
2021-06-21 11:05:22 -04:00
luc eygasier
b886cd904f Updates Uncontrolled Changelists module so unload operations removes files from reconcile cache.
* Removes "clear cache" contextuals actions from reconcile menu.
* Refresh action in Changelist Window now cleans loaded files cache to reconcile

#rb Sebastien.Lussier

#changelist validated

#ROBOMERGE-SOURCE: CL 16693262 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16693278 by luc eygasier in ue5-release-engine-test branch]
2021-06-16 14:37:34 -04:00
luc eygasier
87c6e2529b Update contextual menu in Changelist window to support Uncontrolled Changelists
* Update MarkForAdd operation to operate on a specified changelist
* Adds Force option in sync operation to be able to revert uncontrolled files
* Adds the resulting new changelist to FNewChangelist operation
* Adds support for "mark for add" files when moving from UCL to C
* Adds support for reverting Uncontrolled Changelist, Uncontrolled Changelist files, or mixes of controlled/uncontrolled files
* Adds support of "Move files to..." contextual action for Uncontrolled files and to Uncontrolled Changelists

#rb Sebastien.Lussier

#changelist validated

#ROBOMERGE-SOURCE: CL 16662633 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v834-16658389)

[CL 16662640 by luc eygasier in ue5-release-engine-test branch]
2021-06-14 15:25:40 -04:00
luc eygasier
8a36dd39f0 Adds automatic discovery of potentially modified files out of SourceControl.
* Adds reconcile contextual actions to manually trigger the verification process
* Loads UncontrolledChangelists module along UnrealEd to be able to hook loaded/saved files sooner
* Adds CPU Trace for FPerforceUpdateStatusWorker::Execute and ParseUpdateStatusResults
* Changes FPerforceCheckOutWorker to update Changelist State if checked out directly to a CL
* Changes FPerforceRevertWorker to update Changelist State after revert

#rb Sebastien.Lussier

#changelist validated

[CL 16477108 by luc eygasier in ue5-main branch]
2021-05-26 18:15:46 -04:00
luc eygasier
a5608833a9 Adds moving files from Uncontrolled Changelist to Changelist.
#rb Sebastien.Lussier
#preflight 609c2b365b35c60001e51d6c

[CL 16306199 by luc eygasier in ue5-main branch]
2021-05-12 17:06:06 -04:00
luc eygasier
9787a46325 Adds Base for Uncontrolled Changelist module.
#rb Sebastien.Lussier

#changelist validated

[CL 16224279 by luc eygasier in ue5-main branch]
2021-05-06 14:40:16 -04:00