Commit Graph

62 Commits

Author SHA1 Message Date
bryan sefcik
da92084a12 Optimized out more private modules includes and dependencies.
#preflight 64627c382965f6ea8ea83bd6

[CL 25479683 by bryan sefcik in ue5-main branch]
2023-05-15 16:26:12 -04:00
wouter burgers
ea73facd46 SourceControl / Skein: Automatically attempt to check out files when a save occurs and provide the user a relevant error in the case of a conflict.
#preflight 63f0d573e832ea950adc2afa

[CL 24299166 by wouter burgers in ue5-main branch]
2023-02-18 10:44:55 -05:00
halfdan ingvarsson
d8445fbdea Package Dialog: Add RMB menu options to copy the file path and the package path to the clipboard. Fix the file path to include the extension and use platform native formatting.
#jira none
#preflight 63bc404cbf54fa7b36f1d56a
#rb sebastian.nordgren

[CL 23615045 by halfdan ingvarsson in ue5-main branch]
2023-01-09 12:03:22 -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
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
bryan sefcik
8cc129f2b6 IWYU Pass 1 - Engine/Source/Editor/...
#jira
#preflight 6306736ac85b7fef22be7751

[CL 21558583 by bryan sefcik in ue5-main branch]
2022-08-24 22:45:13 -04:00
Patrick Enfedaque
66c3748dd6 - Save Current Level / Ctrl+S: Allow skipping the checkout dialog and save only the writable files.
- Fix issue when Level was being saved and it had some non writable dirty external packages
- Fix reentrance issue between FEditorFileUtils::PromptForCheckoutAndSave and FEditorFileUtils::PromptToCheckoutPackages

#rb lauren.barnes, jeanfrancois.dube, lauren.barnes
#preflight 62aa2a524a335ad67cbd6524
#robomerge EngineMerge

[CL 20685693 by Patrick Enfedaque in ue5-main branch]
2022-06-16 08:31:41 -04:00
patrick enfedaque
ab7a1b1abd - WorldPartition: Fix leaking ActorDesc when Actor (in this case PartitonedActor) replaces a deleted Actor with the same name
- Allow deleting Foliage actors
- SPackagesDialog: Do not show multiple assets when package contains 1 valid object and 1 or n invalid objects

#rb jeanfrancois.dube, richard.malo
#preflight 62792487242446ce6c519236

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 20104060 via CL 20104081 via CL 20104096
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20109740 by patrick enfedaque in ue5-main branch]
2022-05-09 15:48:02 -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
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
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
matt kuhlenschmidt
5d10725c0c Fix up use cases of specifying "PrimaryButton" style directly. Replaced instances with SPrimaryButton
#pf https://horde.devtools.epicgames.com/job/612d40b9423a8f00013c5b92

#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 17457077 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17457092 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-09-08 08:29:49 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
Patrick Enfedaque
1c159ae32f Save Package Dialog: Favor non PendingKill as PackageObject if more than one Asset is found in the package (Actor BP Reinstancing)
#rb jeanfrancois.dube

[CL 16125094 by Patrick Enfedaque in ue5-main branch]
2021-04-27 09:34:50 -04:00
Matt Peters
3d7e556c1f Make a static version of FAssetData::IsUAsset to avoid the need to expensively create an FAssetData to test whether an object is the UAsset asset of its package.
#rb Francis.Hurteau, Devlin.Willis
#rnx

[CL 15742031 by Matt Peters in ue5-main branch]
2021-03-18 17:54:23 -04:00
Dave Belanger
96d98e05cc - Filter out UBlueprint assets from cooked packages
- Asset registry filtering is now in outtake instead of intake, to cover all cases: gathered packages, loaded assets and assets from cooked registry (AssetRegistryState)
- Move PKG_ContainsNoAsset filtering from CB to asset registry
#rb Matt.Peters
#jira none

[CL 15719622 by Dave Belanger in ue5-main branch]
2021-03-17 08:59:59 -04:00
JeanFrancois Dube
81aa6a5371 Don't count pending kill objects as assets when determining if a package contains multiple assets.
#rb patrick.enfedaque

#ROBOMERGE-OWNER: JeanFrancois.Dube
#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 15713400 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15714966 by JeanFrancois Dube in ue5-main branch]
2021-03-16 16:26:34 -04:00
Matt Peters
87b4d1837f BlueprintGeneratedClass Assets: prevent BPGC from being used as the asset in WidgetBlueprints and when saving a package.
#jira UE-78220
#rb Dave.Belanger
#rnx

[CL 15605961 by Matt Peters in ue5-main branch]
2021-03-04 10:30:31 -04:00
michael noland
56320f6559 Editor: Add more context to the type column for save selected assets (for niagara, data assets, and data tables)
- Implemented GetDisplayNameFromAssetData for data assets and data tables to show the display name for their native parent class and row type respectively
#rb marc.audy

#ROBOMERGE-SOURCE: CL 15394113 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15394117 by michael noland in ue5-main branch]
2021-02-11 19:52:08 -04:00
Matt Kuhlenschmidt
484b4d0813 Fix aligment of source control buttons in checkout dialog
[CL 15145053 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-20 11:53:39 -04:00
Matt Kuhlenschmidt
489140e52c Source control and save dialog reskin
[CL 15086540 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-14 12:45:46 -04:00
Matt Kuhlenschmidt
c13ac505b2 Updated source control icons
Source control providers now require an FSlateIcon and implementation of GetIcon instead of overriding mutliple functions to do the same thing. Fixed up all known source control providers.

#jira UETOOL-2812

[CL 15045642 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-11 20:50:19 -04:00
JeanFrancois Dube
d736d96085 Show the actor label instead of object name in the save dialog for external actors.
#rb richard.malo

[CL 14431000 by JeanFrancois Dube in ue5-main branch]
2020-10-06 13:17:00 -04:00
jeanfrancois dube
940069410f Add the package owner name in the save dialog; that allows sorting by owner package name, in case the user wants to partially submit actor files belonging to a single level, for example.
#patrick.enfedaque
[FYI] nicole.gorny

#ROBOMERGE-SOURCE: CL 14251141 in //UE5/Release-5.0-M2/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-M2 -> Main) (v723-14217278)

[CL 14251147 by jeanfrancois dube in ue5-main branch]
2020-09-03 08:20:02 -04:00