Commit Graph

31 Commits

Author SHA1 Message Date
jordan hoffmann
490bccda39 [Feature] blueprint diff node outlines colored by diff state
#jira UE-150555
#rb aditya.ravichandran
#preflight 62a38ead2558795127e232d0

[CL 20600224 by jordan hoffmann in ue5-main branch]
2022-06-10 14:52:59 -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
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
Matt Kuhlenschmidt
aed44ee4e6 Unify lock icons
[CL 14634675 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-02 15:56:00 -04: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
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
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
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
Ben Marsh
13d012685f Merging copyright update from 4.19 branch.
#rb none
#rnx
#jira

[CL 3818977 by Ben Marsh in Staging-4.19 branch]
2018-01-02 15:30:26 -05:00
Ben Marsh
20bf0eb6a1 Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017).
#rb none
#lockdown Nick.Penwarden

[CL 3226823 by Ben Marsh in Main branch]
2016-12-08 08:52:44 -05:00
Ben Marsh
4ba423868f Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340)
#lockdown Nick.Penwarden
#rb none

==========================
MAJOR FEATURES + CHANGES
==========================

Change 3209340 on 2016/11/23 by Ben.Marsh

	Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h.

	Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms.

	  * Every header now includes everything it needs to compile.
	        * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first.
	        * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h.
	  * Every .cpp file includes its matching .h file first.
	        * This helps validate that each header is including everything it needs to compile.
	  * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more.
	        * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there.
	        * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible.
	  * No engine code explicitly includes a precompiled header any more.
	        * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies.
	        * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files.

	Tool used to generate this transform is at Engine\Source\Programs\IncludeTool.

[CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Marc Audy
79f610442c Fix shadowed variables
[CL 2467803 by Marc Audy in Main branch]
2015-03-03 12:30:55 -05:00
Jamie Dale
a569f6b356 Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.

[CL 2399803 by Jamie Dale in Main branch]
2015-01-07 09:52:40 -05:00
Dan Oconnor
e1ae7a16ad Nonunity fix
[CL 2393268 by Dan Oconnor in Main branch]
2014-12-18 19:17:27 -05:00
Dan Oconnor
8e29537e30 Fixes for blueprint merge tool when run on assets that aren't conflictng (!IsActivelyMerging when merge is initiated)
[CL 2393216 by Dan Oconnor in Main branch]
2014-12-18 18:17:28 -05:00
Dan Oconnor
1ea7d25e62 Diff and merge tool improvements, introduced tree view to display changes, removed the list view that used to display changes made in the blueprint's various graphs
[CL 2391959 by Dan Oconnor in Main branch]
2014-12-17 19:27:27 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Dan Oconnor
d009d03bb8 Leveraging SMyBlueprint and SKismetInspector in the Diff/Merge tools. Rquired introduction of tabs into those tools because we ran out of screenspace
#coderview Mike.Beach

[CL 2369322 by Dan Oconnor in Main branch]
2014-11-24 18:59:49 -05:00
Dan Oconnor
811b484786 Fixed graph view not allowing you to iterate differences when there were no local or no remote changes
[CL 2350387 by Dan Oconnor in Main branch]
2014-11-05 14:04:10 -05:00
Dan Oconnor
5f4d2fe1c8 Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference
[CL 2349504 by Dan Oconnor in Main branch]
2014-11-04 22:25:35 -05:00
Dan Oconnor
d231f7669a Merge panel's details view can now highlight conflicts
[CL 2345194 by Dan Oconnor in Main branch]
2014-10-30 13:36:47 -04:00
Dan Oconnor
18d0b9eddc Separated list for remote differences and local differences in the graph view for the merge tool
[CL 2342497 by Dan Oconnor in Main branch]
2014-10-28 13:43:26 -04:00