Commit Graph

22 Commits

Author SHA1 Message Date
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -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
Dan Oconnor
9786c96390 Conflict highlighting for the graph view in the merge tool
[CL 2341736 by Dan Oconnor in Main branch]
2014-10-27 19:34:03 -04:00
Dan Oconnor
b26a182a0d Adding PropertiesInOrderDisplayed accessor, Property Highlighting, ShowAllAdvancedProperties, Displayed Properties Changed delegate, Custom Layout disabling, property whitelisting to details view. Used by Diff and Merge tools.
Merge tool highlighting improved, now uses property paths.

[CL 2338733 by Dan Oconnor in Main branch]
2014-10-23 13:16:13 -04:00
Saul Abreu
d18f6fccc4 Added mising #undef LOCTEXT_NAMESPACE in SMergeGraphView.cpp
[CL 2289790 by Saul Abreu in Main branch]
2014-09-08 15:22:04 -04:00
Dan Oconnor
1730471006 #UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list
[CL 2276146 by Dan Oconnor in Main branch]
2014-08-28 10:03:31 -04:00
Dan Oconnor
8d4e6501fd #UE4 CDO view reintroduced to merge tool, replaced set of strings with set of fnames
[CL 2258440 by Dan Oconnor in Main branch]
2014-08-15 17:19:11 -04:00
Dan Oconnor
74590e16c7 #UE4 moved SMergeGraphView into its own file
[CL 2244794 by Dan Oconnor in Main branch]
2014-08-05 17:41:57 -04:00