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
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
05180403e2
Fix for behavior that I can only explain via this compiler bug (or something similar)
...
- https://connect.microsoft.com/VisualStudio/feedback/details/800364/initializer-list-calls-object-destructor-twice
Also fixed possible infinite loop
[CL 2398375 by Dan Oconnor in Main branch]
2015-01-05 22:59:34 -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
52775078f7
Initializing SMergeAssetPickerView::MergeAssetSet, could not start a merge if the revision was changed but the asset was not.
...
#codereview Mike.Beach
[CL 2392974 by Dan Oconnor in Main branch]
2014-12-18 15:32:29 -05:00
Dmitry Rekman
29b798926a
Fix CIS.
...
#codereview Dan.Oconnor
[CL 2392918 by Dmitry Rekman in Main branch]
2014-12-18 14:37:30 -05:00
Dan Oconnor
3b84a1578f
Removed experimental flag on blueprint merging
...
[CL 2392857 by Dan Oconnor in Main branch]
2014-12-18 13:57:42 -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
James Golding
043a3d1c0e
Fix non-unity in MergeUtils.cpp
...
#codereview mike.beach
#lockdown Zachary.EdgertonJones
[CL 2387089 by James Golding in Main branch]
2014-12-12 12:29:52 -05:00
Mike Beach
f8cc7d2d1a
Non-unity fix.
...
[CL 2386162 by Mike Beach in Main branch]
2014-12-11 17:00:10 -05:00
Mike Beach
26388283b4
Fixing some mono/non-unity build errors.
...
[CL 2385818 by Mike Beach in Main branch]
2014-12-11 13:39:40 -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
Matt Kuhlenschmidt
b22b854af7
Fix merge menu entry showing up in the same menu in two places.
...
[CL 2385617
2014-12-11 11:09:39 -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
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
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
Mike Beach
809444724a
[UE-5068] Extending the new command-line asset diff command to handle Blueprint merging.
...
#codereview Dan.OConnor
[CL 2367629 by Mike Beach in Main branch]
2014-11-21 12:21:17 -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
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
