Commit Graph

31 Commits

Author SHA1 Message Date
Jack Porter
db8a6c14e0 Material compiler CustomOutput
Landscape Grass material output node
LandscapeGrassType asset and factory

[CL 2412252 by Jack Porter in Main branch]
2015-01-20 11:04:04 -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
55c3728d11 Added support for showing game and engine classes in the Content Browser
UE-7184 - Show game c++ classes and engine c++ classes in the content browser

The Content Browser now has extra entries for "Game C++ Classes" and "Engine C++ Classes" (with "Game" and "Engine" being renamed to "Game Content" and "Engine Content" respectively). These new folders serve as hosts for the list of available C++ modules, with each module internally mirroring the folder structure on disk.

For example:
- Game C++ Classes
    - ShooterGame
        - Classes
            - Bots
                - ShooterBot
                - ShooterAIController
                - [...]
            - [...]

The Content Browser allows you to navigate and search these classes like you can with assets, and provides convenient access to either edit an existing class, or create a new class (either within a selected folder, or derived from a selected class).

As the Content Browser only shows you known UClass types, any new classes need to be compiled into a loaded module before they will appear. This means that adding a new class will now automatically hot-reload your target module. Should you prefer to handle building and loading your modules manually, you can disable the automatic hot-reload via "Editor Settings" -> "Miscellaneous" -> "Hot Reload" -> "Automatically Hot Reload New Classes" (see UEditorUserSettings::bAutomaticallyHotReloadNewClasses).

[CL 2409386 by Jamie Dale in Main branch]
2015-01-16 15:39:47 -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
Richard TalbotWatkin
524d362594 Creating an asset with the same name as one marked for delete no longer prompts for a check in, but just reverts the delete, checks out the package, and creates the new package in place of the old one.
#jira UE-4546 - Creating an asset with the same name as one marked for delete requires a check in

[CL 2345097 by Richard TalbotWatkin in Main branch]
2014-10-30 12:46:57 -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
Andrew Rodham
4ad1b987fc Improved progress reporting in the editor
FScopedSlowTask has been refactored to better allow for nesting of slow operations. This allows us to cascade nested scopes and provide accurate feedback on slow tasks. FScopedSlowTasks now work together when nested inside sub functions. Break up long functions that contain calls to multiple nested FScopedSlowTasks with FScopedSlowTask::EnterProgressFrame().

Example Usage:
void DoSlowWork()
{
    FScopedSlowTask Progress(2.f, LOCTEXT("DoingSlowWork", "Doing Slow Work..."));
    // Optionally make this show a dialog if not already shown
    Progress.MakeDialog();

    // Indicate that we are entering a frame representing 1 unit of work
    Progress.EnterProgressFrame(1.f);

    // DoFirstThing() can follow a similar pattern of creating a scope divided into frames. These contribute to their parent's progress frame proportionately.
    DoFirstThing();

    Progress.EnterProgressFrame(1.f);
    DoSecondThing();
}

This addresses TTP#338602 - NEEDS REVIEW: Editor progress bars nearly always just show 100%, don't offer useful indication of progress

[CL 2322391 by Andrew Rodham in Main branch]
2014-10-08 04:42:34 -04:00
Michael Noland
928559eaa0 Editor: Coding-standards fixes (TypeName [*|&] VariableName -> TypeName[*|&] VariableName)
[CL 2316341 by Michael Noland in Main branch]
2014-10-01 14:45:23 -04:00
Andrew Brown
f248a306fc Added event when a import fails, with extension information
#ttp 344941 - Record Import failed events when users drag unsupported formats into the content browser

#branch UE4

reviewed by Thomas.Sarkanen

[CL 2305533 by Andrew Brown in Main branch]
2014-09-22 10:12:38 -04:00
Marc Audy
b9e437c510 Remove UFactory::ValidGameNames, any such factory should not be in shared code
[CL 2304891 by Marc Audy in Main branch]
2014-09-21 20:34:09 -04:00
Olaf Piesche
081c5e1d85 New Niagara effect class, factory, asset type actions and surrounding infrastructure plus a skeleton editor; bit of cleanup and removal of unnecessary opcodes from the VM. Moved particle data into its own class for separate and easier buffer management.
[CL 2300011 by Olaf Piesche in Main branch]
2014-09-16 16:11:48 -04:00
Lina Halper
1ed6aaa87d - Animation Retargeting offline solution using rig
- Rig asset/Customization
- Retargeting Manager
- Support retargeting using the data

[CL 2295182 by Lina Halper in Main branch]
2014-09-12 11:37:36 -04:00
Dan Oconnor
7e5f8ef155 #UE4 quick fix to keep package from showing up when loaded from history
TTP#344630

[CL 2274791 by Dan Oconnor in Main branch]
2014-08-27 14:29:06 -04:00
Bob Tellez
e5e16eadff [AUTOMERGE]
UE4: Consolidated worldassets command line checks to a static function in editorengine and one in the asset registry. This will make it easier to enable

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2255048 by Bob.Tellez on 2014/08/13 15:19:54.

[CL 2255061 by Bob Tellez in Main branch]
2014-08-13 15:24:26 -04:00
Lina Halper
d1fc74839e Fixed FBX issue where failed once, the second time it crashes due to invalid object.
343098	EDITOR: FBX: CRASH: Editor will crash when trying to import a skeletal mesh with multiple root bones a second time

- It was due to package is deleted, but access it again after.

[CL 2245031 by Lina Halper in Main branch]
2014-08-05 21:33:05 -04:00
Maciej Mroz
c1febea176 Removed code related to ttp237118 "ROCKET: HUGE: K2: Change 'Class' to be primary asset (seen in content browser etc) instead of Blueprint"
The "_C" postif should not be visible in UI and (and gameplay code).

#codereview Nick.Whiting

[CL 2239913 by Maciej Mroz in Main branch]
2014-08-01 11:07:59 -04:00
Max Preussner
bf99532117 Media: removed legacy movie texture support
[CL 2238425 by Max Preussner in Main branch]
2014-07-31 11:54:20 -04:00
Martin Mittring
b58ae4285d * added new shading model Subsurface_Profile, can specify SubsurfaceProfile asset on the material, create it in content browser
no backscattering yet, might replace Preintegrated and Subsurface shading models, can be optimized, postprocess pass only runs if an object on the screen is using it, uses SeparableSSS by Jorge Jimenez and Diego Gutierrez

[CL 2236313 by Martin Mittring in Main branch]
2014-07-29 17:33:28 -04:00
Lina Halper
9645269afa Analytics addition for Persona/Phat/CreateAsset
[CL 2230266 by Lina Halper in Main branch]
2014-07-24 13:35:28 -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
Andrew Brown
348e57371c Diffed assets no longer appear in the asset picker
#ttp 337409 - Editor: Temporary diff assets show up in asset picker

#branch UE4

#change Diffed packages now get loaded with the ForDiff flag, which allows us to filter them out later on.

reviewed by Thomas.Sarkanen

[CL 2124444 by Andrew Brown in Main branch]
2014-07-02 09:37:57 -04:00
Mikolaj Sieluzycki
5d03a01712 Remove redundant headers from Engine.h.
#proj core
#branch UE4
#summary Remove redundant headers from Engine.h. (NavDataGenerator.h NavLinkRenderingProxy.h NavigationModifier.h NavigationOctree.h ContentStreaming.h ComponentReregisterContext.h InstancedFoliage.h UnrealExporter.h EngineService.h NavigationSystemHelpers.h HardwareInfo.h EngineModule.h)
#codereview Robert.Manuszewski

[CL 2109115 by Mikolaj Sieluzycki in Main branch]
2014-06-18 07:25:31 -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
Mark Satterthwaite
6b6afdde88 Fix AssetTool's diff command generation generating garbage strings and modify Mac's ExecProcess and CreateProc to handle finding applications by name and using application bundles.
#codereview michael.trepka

[CL 2104565 by Mark Satterthwaite in Main branch]
2014-06-13 10:19:41 -04:00