izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
23,765 Commits 23 Branches 254 Tags
bf86f78d7b67c77bfe33556c3511907347745844
Commit Graph

26 Commits

Author SHA1 Message Date
Dan Oconnor
9ce52176ef [UE-10822] We weren't handling trivial case of accepting the blueprint with no changes as the merge resolution, also we weren't closing existing blueprint editors 
[CL 2461538 by Dan Oconnor in Main branch]
 2015-02-25 21:42:38 -05:00
Steve Robb
0756ef15b9 Delegate comparisons deprecated, lots of other associated code deprecated, and lots of warning fixups: 
* Multicast delegate Add* calls now return FDelegateHandles, and Remove* calls are now all deprecated, except for a new Remove function which takes a FDelegateHandle.
* New FConsoleManager::RegisterConsoleVariableSink_Handle and UnregisterConsoleVariableSink_Handle functions which work in terms of FConsoleVariableSinkHandle.
* Timer calls which don't take FTimerHandles are deprecated.
* FTicker::AddTicker now returns an FDelegateHandle and is removed by an overloaded Remove function.
* DEFINE_ONLINE_DELEGATE* macros now define _Handle variants of the Add/Remove functions which return/take handles.
* Various other handle-based registration changes.
* Some unity build fixes.
* Some simplification of delegate code.
* Fixes for lots of existing code to use handle-based registration and unregistration.

#codereview robert.manuszewski

[CL 2400883 by Steve Robb in Main branch]
 2015-01-08 09:29: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
Mike Beach
ca94ad12c3 [UE-5744/UE-5743] Adding a mode to the blueprint merge panel that lets you pick arbitrary blueprints to merge against each other. 
#codereview Dan.OConnor

[CL 2385712 by Mike Beach in Main branch]
 2014-12-11 12:24:41 -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
Mike Beach
3c8b5fb5ea [UE-5075/UE-5070] Adding accept source/target buttons to the merge tool. 
#codereview Dan.OConnor

[CL 2376351 by Mike Beach in Main branch]
 2014-12-04 15:45:39 -05:00
Mike Beach
10aa6932f9 [UE-5740] The finish/cancel buttons now close out the editor when running the merge tool from command-line. 
#codereview Dan.OConnor

[CL 2368928 by Mike Beach in Main branch]
 2014-11-24 17:38:44 -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
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
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
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
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
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
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
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
7785127027 #ue4 build fix 
[CL 2117101 by Dan Oconnor in Main branch]
 2014-06-25 16:21:22 -04:00