Commit Graph

29 Commits

Author SHA1 Message Date
Max Preussner
1c200b1d2f Editor: Added missing forward declarations, headers, documentation
[CL 2626985 by Max Preussner in Main branch]
2015-07-20 23:09:05 -04:00
Mieszko Zielinski
0be96565ff extracted EAssetTypeCategories into a separate header so that it can be cleanly used by other modules #UE4
[CL 2582425 by Mieszko Zielinski in Main branch]
2015-06-10 05:19:42 -04:00
Michael Noland
882aee9c55 Content Browser: Added the ability to register new advanced categories without editing engine source
Paper2D: Defined a "Paper2D" category and moved existing asset type actions over

New methods on IAssetTools:
- RegisterAdvancedAssetCategory
- FindAdvancedAssetCategory
- GetAllAdvancedAssetCategories

Upgrade Note: This gets rid of the named extension sections in the filter menu, which should instead be extended via registering a new category.

[UE-13646]
#codereview bob.tellez

[CL 2525743 by Michael Noland in Main branch]
2015-04-25 14:49:25 -04:00
Richard TalbotWatkin
da67c07130 Fix issue where renamed assets were incorrectly absent from the "In Use By Level" filter in the Content Browser until toggling the filter on and off.
#jira UE-11567 - In Use By Level Filter disabled when renaming asset
#jira UE-11569 - Moving an asset In Use By Level is enabled will make it not visible in filter
#codereview Matt.Kuhlenschmidt

[CL 2508158 by Richard TalbotWatkin in Main branch]
2015-04-10 06:55:02 -04:00
Mike Fricker
114458bf0f Clang warning fixes: Fixed missing 'override' specifiers
- Also removed some unreferenced functions that adding 'override' revealed

PR #1002 -- Thank you, Omar007!

[CL 2498415 by Mike Fricker in Main branch]
2015-04-01 07:20:55 -04:00
Jamie Dale
6af0f20199 Data table improvements
UETOOL-281 - Improve data table workflows
UETOOL-282 - Data tables cannot be exported as CSV
UETOOL-289 - Data tables cannot represent arrays in their CSV data

Split up the util functions into their own file (DataTableUtils).
Split up the CSV exporting/importing into its own file (DataTableCSV).
Split up the JSON exporting/importing into its own file (DataTableJSON).
Added support for exporting/importing/displaying array properties.
Added the ability to export a data table as CSV.
Added the ability to import a data table from JSON.

[CL 2494005 by Jamie Dale in Main branch]
2015-03-27 12:29:42 -04:00
Matthew Griffin
a6913887a2 [INTEGRATE] Change 2435229 by bruce.nesbit@bnesbit_Releases on 2015/02/06 08:09:07
Fixed issue with editor layout when inserting feature pack during editor startup
	(Fixes Jira 9223)

[CL 2446729 by Matthew Griffin in Main branch]
2015-02-16 04:26:14 -05:00
Ben Marsh
8c040f96f4 [INTEGRATE] Change 2418630 by Jamie.Dale@Pitbull_JDaleReleases on 2015/01/26 10:50:03
Added the concept of "ClassTypeActions" for class asset types (C++ classes and Blueprints)

	UE-7970 - Add small 'play' button to EditorTutorial asset thumbnail

	Class asset types (C++ classes and Blueprints) are now able to provide actions that should be performed based upon the type of class the asset contains, rather than the asset class itself (which is always "Class" or "Blueprint").

	This will allow the editor tutorials to provide class type actions for Blueprints that derive from "EditorTutorial" without requiring this information to be put into the asset type actions for Blueprint assets.

	ReviewedBy Thomas.Sarkanen

[CL 2419736 by Ben Marsh in Main branch]
2015-01-26 20:21:39 -05:00
Ben Marsh
bcf50ebacc [INTEGRATE] Change 2416912 by Jamie.Dale@Pitbull_JDaleReleases on 2015/01/23 11:17:07
Added the ability for asset type actions to provide an extra overlay layer for their asset thumbnails

	UE-7970 - Add small 'play' button to EditorTutorial asset thumbnail

	Also cleaned up FAssetThumbnail::MakeThumbnailWidget so that it took a config struct (FAssetThumbnailConfig) rather than 7 or 8 defaulted parameters.

[CL 2419655 by Ben Marsh in Main branch]
2015-01-26 19:57:37 -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
Stephan Delmer
6f7661f391 Merging using UE4-Fortnite-To-UE4 from CL 2403093
[CL 2407402 by Stephan Delmer in Main branch]
2015-01-15 11:57:16 -05:00
Richard TalbotWatkin
2152c1c343 Deprecated SCreateNewAssetFromFactory.
#jira UE-7384 - Using "Create New Asset" twice in a row causes an ensure generating the error message

[CL 2403504 by Richard TalbotWatkin in Main branch]
2015-01-12 11:19:20 -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
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
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 Hertzka
7d053de086 Asset context menu refactor & polish
- Duplicate now works properly in the asset view.

- Consolidated common asset actions into the asset context menu and removed the duplicate code from all asset type actions that had implemented them. The affected actions are Edit, Reimport, Find in Explorer, and Open in External Editor. The latter three actions are only visible for imported assets.

- Added IsImportedAsset() and GetSourceFilePaths() to IAssetTypeActions for use by the context menu.

- Compressed the bottom matter on the context menu by removing section headers and compressing Source Control options into a sub-menu (when connected, otherwise there's just a "connect" menu entry).

- Added lots of icons! (The missing ones are TTP'd)

- Fixed FAssetEditorManager::OpenEditorForAssets to work in a useful fashion. IAssetTypeActions::OpenAssetEditor() already took in a UObject array, so it is up to the class's asset type actions to decide how to handle editing multiple assets. (It appeared to be before, but wasn't really).

- Removed the "Details" option from the context menu (since it's redundant when there's a guaranteed "Edit" option)

- Consolidated all skeleton-related actions into AnimationEditorUtils and removed the duplicate code from FAssetTypeActions_SkeletalMesh and FAssetTypeActions_Skeleton

- Compressed the Paper2D sprite options for textures into a submenu

- Renamed "New" to "Create" in content browser

[CL 2324288 by Dan Hertzka in Main branch]
2014-10-09 12:35:10 -04:00
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
Dan Oconnor
2075fd7981 #UE4 I will not use uniform initialization syntax, I will not use uniform initialization syntax, I will not use uniform initialization syntax
[CL 2118171 by Dan Oconnor in Main branch]
2014-06-26 13:17:12 -04:00
Richard TalbotWatkin
1409e69df0 Created Blueprint category for new assets and filters.
#ttp 339216 - Feature Request: Content Browser: Create Blueprint catagory for new assets
#branch UE4
#proj Developer.AssetTools, Editor.Blutility, Editor.ContentBrowser, Editor.GameplayAbilitiesEditor, Editor.UnrealEd
#add Reassigned asset categories, putting all Blueprint type assets under a new Blueprint category.
#add Added new submenu in FNewAssetContextMenu::MakeContextMenu().
#add Added new filter map entry in SFilterList::MakeAddFilterMenu().
#reviewedby Chris.Wood

[CL 2117647 by Richard TalbotWatkin in Main branch]
2014-06-26 02:29:30 -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
Matt Kuhlenschmidt
cb140c07dc Merged GitHub pull request #202 to main.
refactored tga code to allows use outside of EditorFactories.cpp
added support for grayscale jpeg
fix memory leak in jpeg code
changes in AssetTools to allow to specify precise factory when multiple factories support the same filetype
changes in Plugin.cs to allow binary only plugins
exposed parts of engine API to other modules

[CL 2108453 by Matt Kuhlenschmidt in Main branch]
2014-06-17 16:16:40 -04:00
Dan Oconnor
bf6ab17e30 #UE4 adding an accessor so that I don't have to copy/paste the loadmodule call, matches the empty module template...
[CL 2107248 by Dan Oconnor in Main branch]
2014-06-16 14:26:53 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Fred Kimberley
3aaa8071f3 Added gameplay asset type category.
Modified FilterList and NewAssetContextMenu to only display categories that contain at least one item.

[CL 2103921 by Fred Kimberley in Main branch]
2014-06-12 19:36:17 -04:00