Commit Graph

97 Commits

Author SHA1 Message Date
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05: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
Patrick Boutot
aeea5f0679 Slate: Convert SConcertScrollBox, SWrapBox, SBoxPanel, SWindow FSlot's to the FSlotArgument syntax.
#jira UE-114425
#preflight 60adb0b704188d000133d0b9

[CL 16466544 by Patrick Boutot in ue5-main branch]
2021-05-26 06:42:00 -04:00
Patrick Boutot
7e89b18bb7 Fix CIS. Missing include.
#jira UE-113790
#rb none
#rnx

[CL 16051206 by Patrick Boutot in ue5-main branch]
2021-04-19 11:19:36 -04:00
Matt Peters
a792bc3ab5 #jira FROST-1436
Interim BlueprintGeneratedClass::IsAsset change:
All code that is enumerating unfiltered assets in a package/outer needs to handle multiple assets, or if it can't, needs to call ShouldSkipAsset or IsUAsset to skip over the non-UAsset assets.

Move UE::AssetRegistry::FFiltering into CoreUObject to make it accessible to FindAssetInPackage.
#rb Dave.Belanger
#rnx

[CL 15766334 by Matt Peters in ue5-main branch]
2021-03-22 14:00:30 -04:00
Matt Kuhlenschmidt
d2368b5d98 Consolidating icons.
Moved property editing icons to the generic icon set.

[CL 14753068 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-16 09:57:56 -04:00
Matt Kuhlenschmidt
aed44ee4e6 Unify lock icons
[CL 14634675 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-02 15:56:00 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
brooke hubert
a470770796 Remove deprecated asset editor manager.
#Jira none
#rb lauren.barnes

[CL 13816532 by brooke hubert in ue5-main branch]
2020-07-01 16:35:41 -04:00
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
marc audy
dbcf07a558 Use new inline versions of substring functions
Fix up nearby cases where ESearchCase::CaseSensitive should have been used
#jira
#rnx
#rb

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10309793 via CL 10309818
#ROBOMERGE-BOT: (v593-10286020)

[CL 10309932 by marc audy in Main branch]
2019-11-19 13:27:07 -05:00
ccarvalheiro
e1a182475b PR #6098: Fix editor crash when accepting local revision during merge (Contributed by ccarvalheiro)
#rb Dan.OConnor

[CL 9116862 by Dan Oconnor in Dev-Framework branch]
2019-09-25 20:12:08 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
Marc Audy
9396844ccc Reorg Blueprint data to pack better and not have editor only concepts in non-editor builds
UBlueprint OnChangedEvent and OnCompiledEvent are now editor only events.
#rb

[CL 7290435 by Marc Audy in Dev-Framework branch]
2019-07-12 13:24:46 -04:00
Ben Zeigler
051491cc4f #jira UE-73199 Add support for blueprint subclass-specific diffing, by moving the diff results logic into Engine and adding overrides
Implement diffing for Widget tree default values
Refactored SBlueprintDiff significantly to avoid code duplication and add comments
Change DiffUtils to not recurse into instanced objects unless they are EditInlineNew and not a component
#codereview dan.oconnor
#rb none

[CL 6334975 by Ben Zeigler in Dev-Framework branch]
2019-05-06 21:09:17 -04:00
Ben Zeigler
37dc689836 #jira UE-73228 My Blueprint and Graphs are no longer tabs and are separate top level entries in differ, this is in preparation for showing blueprint variables changes
#jira UE63967 Fix blueprint diff to correctly generate My Blueprint data for remote blueprints
Several other layout changes, including moving the diff labels to the header section
#rb None

[CL 6153329 by Ben Zeigler in Dev-Framework branch]
2019-04-29 20:46:17 -04:00
Ben Zeigler
fcb7011543 #jira UE-23260 Fix it so all methods of loading a package for diffing pass the correct load flag
#rb none

[CL 6142571 by Ben Zeigler in Dev-Framework branch]
2019-04-29 15:32:15 -04:00
Ben Zeigler
a7b5f655dc #jira UE-21517 Fix reverse of add/removed pin display on graph diffs, and updated variable names to avoid this in the future as Pin1 was not very descriptive
#jira UE-48826 Fix graph differ to always use a relative path instead of the raw name, fixes several issues with anim BP diffing
#codereview dan.oconnor
#rb None

[CL 6037475 by Ben Zeigler in Dev-Framework branch]
2019-04-22 14:36:25 -04:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Marc Audy
608734e30d Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414
#rb
#rnx

[CL 4666113 by Marc Audy in Dev-Framework branch]
2018-12-17 12:24:20 -05:00
Matt Kuhlenschmidt
46e3285149 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4543237 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-06 10:00:36 -05:00
dan oconnor
b502d0419a Added logging to Blueprint merge operation
#jira UE-58891
#rb Phillip.Kavan

#ROBOMERGE-SOURCE: CL 4426071 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426072 by dan oconnor in Staging-4.21 branch]
2018-10-03 18:30:34 -04:00