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
22,423 Commits 23 Branches 254 Tags
bb9ed201650b1303c825750794335750464fd0ff
Commit Graph

24 Commits

Author SHA1 Message Date
Thomas Sarkanen
be75fe1eca Updated revision display to display strings rather than revision indices 
API break: added new pure virtual ISourceControlProvider::UsesChangelists()
API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&)
API break: added new pure virtual ISourceControlRevision::GetRevision()

Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly.

[CL 2411986 by Thomas Sarkanen in Main branch]
 2015-01-20 05:48:14 -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
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 by Matt Kuhlenschmidt in Main branch]
 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
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
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
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
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
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
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
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
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
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