Dan Oconnor 5730043362 Moved Blueprint Merge tool toggle to experimental editor settings ...

[CL 2345631 by Dan Oconnor in Main branch]

2014-10-30 20:04:18 -04:00

..

BlueprintMergeData.h

Conflict highlighting for the graph view in the merge tool

2014-10-27 19:34:03 -04:00

Merge.cpp

Moved Blueprint Merge tool toggle to experimental editor settings

2014-10-30 20:04:18 -04:00

MergePrivatePCH.h

#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge

2014-06-25 13:25:21 -04:00

SBlueprintMerge.cpp

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

SBlueprintMerge.h

Conflict highlighting for the graph view in the merge tool

2014-10-27 19:34:03 -04:00

SMergeDetailsView.cpp

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

SMergeDetailsView.h

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

SMergeGraphView.cpp

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

SMergeGraphView.h

Separated list for remote differences and local differences in the graph view for the merge tool

2014-10-28 13:43:26 -04:00

SMergeTreeView.cpp

Merge view for components no longer lists the same difference multiple times

2014-08-28 10:43:40 -04:00

SMergeTreeView.h

#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list

2014-08-28 10:03:31 -04:00