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
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
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
