Commit Graph

9 Commits

Author SHA1 Message Date
Thomas Sarkanen
f42f5d0781 Fix branching creating multiple files
Branching of files needed to be removed (by Bob Tellez) as it was causing crashes and mutiple duplicate files to show up in the content browser. This fix re-instates working branches in the Editor.
The idea is that we now do the copy/duplicate/rename operations first, then perform the 'branch' once the files are finished with by the Editor. This keeps the asset registry & directory watcher systems happy & leaves the issue of branching to source control alone.
Because of the way SVN copy works, the SVN verison of this is slightly icky. SVN copy does not allow a branch-copy over an existing file in the workspace (even if not under source control), so we have to move the file into a temp directory, do the copy, then re-move the file back over the top of its old location.

TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)

reviewed by Max.Preussner,Bob.Tellez,Matt.Kuhlenschmidt

[CL 2180124 by Thomas Sarkanen in Main branch]
2014-07-09 06:31:13 -04:00
Frank Fella
ec5fc0ef7f Content Browswer - Fix a crash when dragging the root folder, and also disallow moving a parent folder to a child folder.
[CL 2170042 by Frank Fella in Main branch]
2014-07-07 11:16:23 -04:00
Ben Marsh
de9c0853bf Add an toggle for showing plugin content, and disable it by default.
[CL 2124821 by Ben Marsh in Main branch]
2014-07-02 13:18:43 -04:00
Richard TalbotWatkin
cae2251bba Changed all instances of notifications with a "Show Log" hyperlink to be more precise about which log they will open.
#ttp 338544 - EDITOR: Update Notifications "Show Log" to "Show Output Log"
#branch UE4
#change Changed hyperlink text to be more specific in individual instances of FNotificationInfo objects.
#reviewedby Chris.Wood

[CL 2108221 by Richard TalbotWatkin in Main branch]
2014-06-17 12:05:50 -04:00
Bob Tellez
ee55183e2b UE4: Removed many unnecessary checks in the editor to special-case assets found in umap files.
[CL 2073723 by Bob Tellez in Main branch]
2014-05-14 22:02:10 -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
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
UnrealBot
db494a6e69 Engine source (Main branch up to CL 2037954) 2014-04-02 18:09:23 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00