6 Commits

Author	SHA1	Message	Date
Matthew Griffin	5e350e8eb4	[INTEGRATE] Change 2444702 by Nick.Darnell@Nick.Darnell_Dev on 2015/02/13 09:57:20 ... UE-9699 - Fixing all the places we were setting the asset size to 0 explictly, the new default reasonable size is .1, all asset pickers now just use the default, unless they're the content browser. #lockdown Matt.Kuhlenschmidt [CL 2449865 by Matthew Griffin in Main branch]	2015-02-18 05:42:18 -05:00
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
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	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
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