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 |
|
Dan Oconnor
|
9f2f87ad61
|
#UE4 Removed some ill advised buttons (take local, take remote, auto merge are difficult to implement for all blueprints), tweaked ownership (bluepint merge tool can keep shared ptr to blueprint editor - verified no shared ptr cycle when closing blueprint editor), corrected merge-accepted logic for embedded blueprint merge widget
[CL 2182173 by Dan Oconnor in Main branch]
|
2014-07-09 16:15:29 -04:00 |
|
Dan Oconnor
|
994103ffcb
|
#UE4 Merge panel more correctly integrated into blueprint editor, ownership cleaned up, cancel action restored...
[CL 2181671 by Dan Oconnor in Main branch]
|
2014-07-09 13:18:10 -04:00 |
|
Dan Oconnor
|
76102fcda0
|
#ue4 build fix
[CL 2176815 by Dan Oconnor in Main branch]
|
2014-07-08 18:33:09 -04:00 |
|
Dan Oconnor
|
24701a8945
|
#ue4 first pass of moving mereg tool into blueprint editor, still has tab restoring issues.. disabled by EnableAssetMerge ini flag
[CL 2176560 by Dan Oconnor in Main branch]
|
2014-07-08 18:23:08 -04:00 |
|
Dan Oconnor
|
9e09928ffc
|
#ue4 more uniform initialization that needs to be removed.
[CL 2118421 by Dan Oconnor in Main branch]
|
2014-06-26 15:58:00 -04:00 |
|
Dan Oconnor
|
297fd4919b
|
#ue4 build fix
[CL 2117106 by Dan Oconnor in Main branch]
|
2014-06-25 16:26:10 -04:00 |
|
Dan Oconnor
|
7785127027
|
#ue4 build fix
[CL 2117101 by Dan Oconnor in Main branch]
|
2014-06-25 16:21:22 -04:00 |
|
Dan Oconnor
|
79165ed057
|
#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge
[CL 2116875 by Dan Oconnor in Main branch]
|
2014-06-25 13:25:21 -04:00 |
|