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
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
Dan Oconnor
d231f7669a
Merge panel's details view can now highlight conflicts
...
[CL 2345194
2014-10-30 13:36:47 -04:00
Dan Oconnor
192a753d4b
Can open merge tool from context menu, moved ini switch into editor ini
...
[CL 2343166 by Dan Oconnor in Main branch]
2014-10-28 22:59:51 -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
Wes Hunt
31e2bb00ac
Removed a bunch of stuff from Slate standard include, created SlateBasics.h
...
* Moved Slate.h into SlateBasics.h and began shifting less commonly used headers into SlateExtras.h.
* Slate.h now simply includes SlateBasics.h and SlateExtras.h.
* Slate.h includes a deprecated warning now to indicate that SlateBasics.h + specific includes should be used instead.
* Moved dozens of inlined functions using Slate widgets into .cpp files to avoid header dependencies.
* All code samples now include SlateBasics.h and SlateExtras.h so future shifts will not break most those projects, but not trigger the deprecation warning of including Slate.h.
#BUN
[CL 2329610 by Wes Hunt in Main branch]
2014-10-14 22:50:06 -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
4b8c2df7a3
Abusing a global, moved to member function. This triggered an assert on Linux, may also not play nice with monolithic builds that include the merge module...
...
[CL 2281945 by Dan Oconnor in Main branch]
2014-09-02 16:17:21 -04:00
Dan Oconnor
81fe6cf774
Files are now backed up when merge begins, merge window correctly docks with blueprint editor by default
...
[CL 2281474 by Dan Oconnor in Main branch]
2014-09-02 10:15:49 -04:00
Dan Oconnor
7f0a7c6743
Backing out my last change... it results in the merge tool not staying open when tabs are switched. This restores the previous bug: the merge tool is initially floating
...
[CL 2280864 by Dan Oconnor in Main branch]
2014-09-01 22:02:31 -04:00
Dan Oconnor
2c6bda418c
#UE4 spawning the merge tab in the blueprint editor's tab manager, this makes the merge tool window appear in the blueprint editor initially, much more intuitive because the merge tool responds to tab switches performed in the blueprint editor...
...
[CL 2280813 by Dan Oconnor in Main branch]
2014-09-01 20:17:10 -04:00
Dan Oconnor
224bb922af
Merge view for components no longer lists the same difference multiple times
...
[CL 2276187 by Dan Oconnor in Main branch]
2014-08-28 10:43:40 -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
fa76c73bd2
#UE4 fix for not all fields being hidden in details view of diff panel when 'show differing' is selected. Made the 'differing' filter a whitelist, rather than a blacklist. There are still bugs involving diffing of structures that have aggregate structures. Possibly also arrays and member objects depending on what the details view does with them.
...
[CL 2271403 by Dan Oconnor in Main branch]
2014-08-25 19:23:04 -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
f29216352f
#UE4 Merge tool now switches modes with the blueprint editor
...
[CL 2245790 by Dan Oconnor in Main branch]
2014-08-06 13:57:21 -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
Dan Oconnor
23221887d6
#UE4 build fix, missing file
...
[CL 2244633 by Dan Oconnor in Main branch]
2014-08-05 16:12:03 -04:00
Dan Oconnor
2735b8d9e2
#UE4 blueprintmerge no longer has buttons, binds to blueprint editor. No longer inherits from SBlueprintDiff.
...
[CL 2244539 by Dan Oconnor in Main branch]
2014-08-05 14:46:11 -04:00
Dan Oconnor
8aa1950967
#ue4 const correctness for merge and diff tools... merge copies the blueprint it is merging now, so that we can present a fixed view of the blueprint at the beginning of the merge operation
...
[CL 2221111 by Dan Oconnor in Main branch]
2014-07-16 15:00:09 -04:00
Dan Oconnor
8566ea71b7
#UE4 Reworked tab spawner registration - limiting ourself to a single merge operation at a time for the moment.
...
[CL 2220069 by Dan Oconnor in Main branch]
2014-07-15 20:22:37 -04:00
Dan Oconnor
89b2bcf6b4
#UE4 pulling merge tool out of the tabmanager (fixes bug where we could not close the merge tool when the tab manager created it, fixes bug where tab manager would destroy merge tool when we switched tabs..)
...
[CL 2219523 by Dan Oconnor in Main branch]
2014-07-15 13:27:02 -04:00
