Commit Graph

264 Commits

Author SHA1 Message Date
Bob Tellez
96c40b8974 Merging UE4-Fortnite -> Main using CL#2047477
[CL 2049479 by Bob Tellez in Main branch]
2014-04-23 19:29:53 -04:00
Bob Tellez
cb0d843336 UE4: Finding world assets in explorer now properly uses the .umap extension
[CL 2047364 by Bob Tellez in Main branch]
2014-04-23 19:06:37 -04:00
Thomas Sarkanen
d5f6456c9a #summary Added ability to sync directories from source control in the Editor.
#ttp 331349 	Editor: Source Control: Request for ability to sync directories in the Editor
#add 	Added new menu option to sync a directory from the path/asset view.
#change 	Changed P4 sync command to append '...' to directory arguments, so subdirectories are also processed.
#fix 	Fixed Subversion file status being incorrectly reported on Editor startup for statuses that require server access (lock, sync etc.).
#change 	Changed PackageTools::UnloadPackages to return an error message. This avoid multiple popup messages. Also fixed issue where an unload could fial to unload a package (because it wasnt loaded in the first place) and then fail to sync because of it.
reviewed by 	Andrew.Brown

[CL 2046626 by Thomas Sarkanen in Main branch]
2014-04-23 18:51:56 -04:00
Nick Darnell
a67b8adbd0 * The thumbnail range slider is now based on the vertical resolution instead of the horizontal. That way users using the unified desktop driver stuff wont have a 8K monitor causing their thumbnails to be gigantic.
[CL 2046586 by Nick Darnell in Main branch]
2014-04-23 18:51:13 -04:00
Gareth Martin
88ea7759fd #TTP 332018 - Regression: EDITOR: LANDSCAPE: CRASH: Choosing a landscape material before creation and then closing the editor will result in a crash
#proj UE4

#summary Fixed crash when closing new landscape dialog with a material selected

[CL 2044063 by Gareth Martin in Main branch]
2014-04-23 18:24:49 -04:00
Jamie Dale
4dd8fa6bf4 #ttp 331051 - EDITOR: Can we extend the Set Color on folder functionality in the content browser to Collections as well?
#proj UE4
#branch UE4
#summary Collections now store and display a custom colour based on the local user settings
#extra This works the same was as it does for folders.
#reviewedby Thomas.Sarkanen, Max.Preussner

[CL 2043079 by Jamie Dale in Main branch]
2014-04-23 18:13:40 -04:00
Thomas Sarkanen
c9179dae1f #summary Prevented engine content from appearing in "Submit To Source Control..." dialog when it shouldnt.
#ttp 331118 	LIVE: Editor: Source Control: Engine content is displayed in Check In dialog
#add 	Added a CanAdd() function to the source control state API & implemented this for both providers.
#change 	Changed asset context menu to restrict operations that can be performed based on the new information provided by CanAdd().
#fix 	Fixed a terrible bug in the SVN provider where only the first batch of 50 files would have their status returned correctly.
reviewed by 	Andrew.Brown

[CL 2043041 by Thomas Sarkanen in Main branch]
2014-04-23 18:13:09 -04:00
Andrew Rodham
07b90d1da2 #ttp 331268 - SLATE: Replace instances of DragDrop::IsTypeMatch with FDragDropEvent::GetOperationAs()
#summary  Replaced instances of DragDrop::IsTypeMatch with FDragDropEvent::GetOperationAs()
#note Please change any instances of DragDrop::IsTypeMatch for the templated FDragDropEvent::GetOperationAs<>() or FDragDropOperation::IsOfType<>() where necessary
#proj Editor
#branch UE4
#reviewedby Nick.Atamas

[CL 2042222 by Andrew Rodham in Main branch]
2014-04-23 18:00:50 -04:00
Nick Darnell
b96d695522 * FDragDropOperation now inherits from TSharedFromThis, no need to do it on subclasses any more. I've removed it from the subclasses that were also doing it.
* FDecoratedDragDropOp's Hover text is now FText, instead of FString.

[CL 2041690 by Nick Darnell in Main branch]
2014-04-23 17:55:20 -04:00
Jamie Dale
3a96821e42 #ttp 330142 - EDITOR: Users are unable to see the file path of a project in the project
#proj UE4
#branch UE4
#summary Added a tooltip to show project information, as well as a context menu option to go to the .uproject file in explorer
#extra There is now a tooltip (styled like the content browser tooltip) showing the description (if available) and the path to the project. There is also a context menu option to go to the .uproject file for the selected project.
#reviewedby Thomas.Sarkanen, Max.Preussner

[CL 2040531 by Jamie Dale in Main branch]
2014-04-23 17:41:37 -04:00
Saul Abreu
b16c5668f5 #summary Updated metadata gathering commandlet to be configuration driven. Fixed a bug with local edits to metadata overriding localization. Updated property editors using comboboxes for enums to use localized data. Added Region & Language Settings for toggling use of localized field names.
#ttp 331251 - L10N: Editor: Tooltips and Property Names need to be localized

[CL 2040155 by Saul Abreu in Main branch]
2014-04-23 17:36:48 -04:00
UnrealBot
db494a6e69 Engine source (Main branch up to CL 2037954) 2014-04-02 18:09:23 -04:00
TimSweeney
3a75fe0114 Engine source (Main branch up to CL 2027006) 2014-03-15 01:14:25 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00