Commit Graph

33 Commits

Author SHA1 Message Date
Unrealbot
3f463d80d4 Branch snapshot for CL 2959226
[CL 2959226 in Main branch]
2016-04-28 13:50:05 -04:00
Nick Darnell
d5a5e56664 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden

Change 2889481 on 2016/03/02 by Richard.TalbotWatkin

	Fixed socket preview component in Static Mesh Editor so that it remains correctly attached if the socket is renamed (Contributed by Manny-MADE).
	PR #2094
	#jira UE-27338 - GitHub 2094 : BUGFIX: Socket preview component broken in Static Mesh Editor

FSlateAtlasedTextureResource

	Made changes to the Perforce source control provider so that operations can be cancelled with immediate effect if there is an issue connecting to the server.
	#jira UE-24632 - "Updating file(s) source control status..." dialog doesn't allow Cancel
	#RB Thomas.Sarkanen

Change 2890359 on 2016/03/02 by Nick.Darnell

	Jira Mirroring - Adding some tools for matching gits sha to perforce commits.  Also adding the program for scraping jira issues and pushing them elsewhere.

Change 2892008 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2813475

Change 2892086 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2813457

Change 2892117 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2812830

Change 2892316 on 2016/03/03 by Richard.TalbotWatkin

	Fixed conversion of brushes to volumes so that the original transform isn't lost.
	#jira UE-24404 - Convert Actor from BSP to volume can affect the actor transform

Change 2892765 on 2016/03/03 by Andrew.Rodham

	Changed public facing level editor classes to use ILevelEditor instead of SLevelEditor

	#codereview Mike.Fricker

Change 2894154 on 2016/03/04 by Richard.TalbotWatkin

	Fixed error in USplineComponent::GetSegmentLength when the segment is linear or constant.

Change 2894481 on 2016/03/04 by Cody.Albert

	#jira UE-27830

	Fixed mismatched layout name

Change 2896339 on 2016/03/06 by Richard.TalbotWatkin

	Fixed undo issues in texture paint mode.
	#jira UE-21206 - Texture Painting bugs

Change 2896713 on 2016/03/07 by Joe.Conley

	Replacing #ifndef with #pragma once

Change 2896955 on 2016/03/07 by Cody.Albert

	#jira UE-27711

	Added initialization for LastHighlightInteractionTime

Change 2898895 on 2016/03/08 by Richard.TalbotWatkin

	More optimizations to editing actors with a large number of components. Improved performance when executing construction scripts.
	#jira UE-24821 - Blueprints with thousands of components perform very badly when selected in the Level Viewport

Change 2900770 on 2016/03/09 by Joe.Conley

	Change #ifndef to #pragma once for headers under Runtime/Engine/Public

Change 2900835 on 2016/03/09 by Richard.TalbotWatkin

	Fixed issues with scrolling items into view in STileView. Also fixed bugs in STileView::ReGenerateItems.
	#jira UE-20441 - Hitting F2 to rename an asset in the Content Browser moves the asset out of view if the CB is at default size and location
	#jira UE-20807 - Browse to Asset in Content Browser focuses just on the text
	#codereview Nick.Atamas

Change 2900837 on 2016/03/09 by Richard.TalbotWatkin

	Added an OnKeyDownHandler to SSearchBox and SAssetSearchBox so that functionality for handling keypresses which is normally handled by SEditableText can be overridden.  Added custom behavior to SAssetPicker and SAssetSearchBox so that up/down cursor keys can be used to change focus from the text box to the menu.
	#jira UE-20567 - UX Regression on Open Asset Panel
	This also addresses a similar issue with the auto-complete popup in the Content Browser search bar.

Change 2900847 on 2016/03/09 by Richard.TalbotWatkin

	Fixed include dependency.

Change 2900951 on 2016/03/09 by Richard.TalbotWatkin

	Fixed non-dependent name lookup for superclass member access.

Change 2901325 on 2016/03/09 by Jamie.Dale

	PR #2107: Output Log Filtering (Contributed by phoboz-net)

Change 2901391 on 2016/03/09 by Jamie.Dale

	Some more output log filter improvements

	We now defer the search until you finish typing, and the filter list itself now uses toggle buttons (like the content browser) so that you can toggle multiple filters without having to re-open the menu.

Change 2901736 on 2016/03/09 by Alexis.Matte

	#jira UE-14632
	Export staticmeshactor which are base on blueprint class as a blueprint instead of exporting it as an actor.

	#codereview nick.darnell

Change 2903162 on 2016/03/10 by Alexis.Matte

	Fbx scene importer, Fix crash when changing the material base path in the material tab page

	#codereview nick.darnell

Change 2903903 on 2016/03/10 by Richard.TalbotWatkin

	Fixed crash when attempting to paste an object from the level viewport into the content browser.
	#jira UE-26100 - Crash when attempting to copy an object from the world into the content browser

Change 2903947 on 2016/03/10 by Richard.TalbotWatkin

[CL 2937134 by Nick Darnell in Main branch]
2016-04-07 16:16:52 -04:00
Nick Darnell
71d3d81e81 Back out Dev-Editor -> Main copy up.
#lockdown Nick.Penwarden

[CL 2936997 by Nick Darnell in Main branch]
2016-04-07 14:58:54 -04:00
Nick Darnell
03c1df75c3 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden

Change 2889481 on 2016/03/02 by Richard.TalbotWatkin

	Fixed socket preview component in Static Mesh Editor so that it remains correctly attached if the socket is renamed (Contributed by Manny-MADE).
	PR #2094
	#jira UE-27338 - GitHub 2094 : BUGFIX: Socket preview component broken in Static Mesh Editor

FSlateAtlasedTextureResource

	Made changes to the Perforce source control provider so that operations can be cancelled with immediate effect if there is an issue connecting to the server.
	#jira UE-24632 - "Updating file(s) source control status..." dialog doesn't allow Cancel
	#RB Thomas.Sarkanen

Change 2890359 on 2016/03/02 by Nick.Darnell

	Jira Mirroring - Adding some tools for matching gits sha to perforce commits.  Also adding the program for scraping jira issues and pushing them elsewhere.

Change 2892008 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2813475

Change 2892086 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2813457

Change 2892117 on 2016/03/03 by Richard.TalbotWatkin

	Back out changelist 2812830

Change 2892316 on 2016/03/03 by Richard.TalbotWatkin

	Fixed conversion of brushes to volumes so that the original transform isn't lost.
	#jira UE-24404 - Convert Actor from BSP to volume can affect the actor transform

Change 2892765 on 2016/03/03 by Andrew.Rodham

	Changed public facing level editor classes to use ILevelEditor instead of SLevelEditor

	#codereview Mike.Fricker

Change 2894154 on 2016/03/04 by Richard.TalbotWatkin

	Fixed error in USplineComponent::GetSegmentLength when the segment is linear or constant.

Change 2894481 on 2016/03/04 by Cody.Albert

	#jira UE-27830

	Fixed mismatched layout name

Change 2896339 on 2016/03/06 by Richard.TalbotWatkin

	Fixed undo issues in texture paint mode.
	#jira UE-21206 - Texture Painting bugs

Change 2896713 on 2016/03/07 by Joe.Conley

	Replacing #ifndef with #pragma once

Change 2896955 on 2016/03/07 by Cody.Albert

	#jira UE-27711

	Added initialization for LastHighlightInteractionTime

Change 2898895 on 2016/03/08 by Richard.TalbotWatkin

	More optimizations to editing actors with a large number of components. Improved performance when executing construction scripts.
	#jira UE-24821 - Blueprints with thousands of components perform very badly when selected in the Level Viewport

Change 2900770 on 2016/03/09 by Joe.Conley

	Change #ifndef to #pragma once for headers under Runtime/Engine/Public

Change 2900835 on 2016/03/09 by Richard.TalbotWatkin

	Fixed issues with scrolling items into view in STileView. Also fixed bugs in STileView::ReGenerateItems.
	#jira UE-20441 - Hitting F2 to rename an asset in the Content Browser moves the asset out of view if the CB is at default size and location
	#jira UE-20807 - Browse to Asset in Content Browser focuses just on the text
	#codereview Nick.Atamas

Change 2900837 on 2016/03/09 by Richard.TalbotWatkin

	Added an OnKeyDownHandler to SSearchBox and SAssetSearchBox so that functionality for handling keypresses which is normally handled by SEditableText can be overridden.  Added custom behavior to SAssetPicker and SAssetSearchBox so that up/down cursor keys can be used to change focus from the text box to the menu.
	#jira UE-20567 - UX Regression on Open Asset Panel
	This also addresses a similar issue with the auto-complete popup in the Content Browser search bar.

Change 2900847 on 2016/03/09 by Richard.TalbotWatkin

	Fixed include dependency.

Change 2900951 on 2016/03/09 by Richard.TalbotWatkin

	Fixed non-dependent name lookup for superclass member access.

Change 2901325 on 2016/03/09 by Jamie.Dale

	PR #2107: Output Log Filtering (Contributed by phoboz-net)

Change 2901391 on 2016/03/09 by Jamie.Dale

	Some more output log filter improvements

	We now defer the search until you finish typing, and the filter list itself now uses toggle buttons (like the content browser) so that you can toggle multiple filters without having to re-open the menu.

Change 2901736 on 2016/03/09 by Alexis.Matte

	#jira UE-14632
	Export staticmeshactor which are base on blueprint class as a blueprint instead of exporting it as an actor.

	#codereview nick.darnell

Change 2903162 on 2016/03/10 by Alexis.Matte

	Fbx scene importer, Fix crash when changing the material base path in the material tab page

	#codereview nick.darnell

Change 2903903 on 2016/03/10 by Richard.TalbotWatkin

	Fixed crash when attempting to paste an object from the level viewport into the content browser.
	#jira UE-26100 - Crash when attempting to copy an object from the world into the content browser

Change 2903947 on 2016/03/10 by Richard.TalbotWatkin

[CL 2936966 by Nick Darnell in Main branch]
2016-04-07 14:48:06 -04:00
Matthew Griffin
755f725131 Merging //UE4/Release-4.11 to //UE4/Main (up to CL#2852902)
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2835191 on 2016/01/19 by Nick.Whiting

	Invert the y-axis on the SteamVR controllers to match the convention of the engine and the rest of the gamepads

	#jira UE-22705

Change 2835686 on 2016/01/20 by Gareth.Martin

	Fixed landscape material instances not being updated if holes are painted on a landscape that doesn't have the landscape visibility mask node in the material and then the visibility mask node is added to the material later.
	#jira UE-18187

Change 2835767 on 2016/01/20 by Richard.Hinckley

	#jira UE-25499 Added a cursor to TopDown template (C++ version) to match the BP version.

Change 2835772 on 2016/01/20 by Richard.Hinckley

	#jira UE-25499 Adding the material asset for the C++ TopDown template's cursor.

Change 2835811 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25699 Added Validity Checks in BP logic, unchecked CDO for Pixel Ship, to Fix Log Warnings
	#jira UE-25704 Adjusted Matinee to happen at Box Location
	#jira UE-25688 Adjusted Player Starts
	#jira UE-25693 Adjusted Player Starts

Change 2835863 on 2016/01/20 by Gareth.Martin

	Fixed crash in the landscape ramp and mirror tools if the streaming level containing the landscape is hidden (or possibly if the landscape actor is deleted)
	#jira UE-24883

Change 2835889 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25698 Enabled V-sync, also fixed up player Respawn Issue

Change 2835995 on 2016/01/20 by Jamie.Dale

	The output log now hard-wraps lines to prevent long lines causing performance issues

	#jira UE-24187

Change 2836052 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25675 Added Blocking Volume to prevent Player from Falling off map
	#jira UE-25676 Added Blocking Volumes so that the Player doesn't get stucl at awkward corners under the Bridge

Change 2836137 on 2016/01/20 by Chad.Taylor

	Vehicle and VehicleAdv template content fixes for new VR camera

	#jira UE-25507

Change 2836166 on 2016/01/20 by Gareth.Martin

	Fixed hiding a streaming level containing a landscape causing the landscape editor to switch to the "New Landscape" tool instead of exiting
	#jira UE-25093

Change 2836174 on 2016/01/20 by Chad.Taylor

	IHeadMountedDisplay crash fix associated with accessing a dangling pointer.

	#jira UE-25272

Change 2836179 on 2016/01/20 by Jamie.Dale

	Optimized FShapedGlyphSequence reverse look-up

	There's now a reverse look-up map of cluster indices to their glyph data in order to avoid brute force looping

	#jira UE-24187

Change 2836286 on 2016/01/20 by Chris.Babcock

	Update Qualcomm TextureConverter for OSX
	#jira UE-22092
	#ue4
	#android

Change 2836328 on 2016/01/20 by Nick.Darnell

	Fixing a problem with widget components crashing on destruction with the render commands to pre/post render for window render commands needing access to the policy, but it potentially being deleted.  Inserting a NoOp command that keeps the shared ptr alive through the RHI render process.

	#jira UE-25752

Change 2836342 on 2016/01/20 by Nick.Darnell

	Depending on shutdown order, the Slate Renderer may go away, and then render data handles may not be collected correctly because they are trying to reference a pointer that's no longer valid and cause a crash on exit. The correct approach would be to have render handles actually have a pointer back to who owns them, in this case the RHI Resource Manager, which is still alive and well at this point in the pipeline.  Then if the resource manager is collected, it forces all handles to get cleaned up correctly, or if the handles are collected first, they can be sure they've got a valid pointer back to the resource manager.

	#jira UE-25753

Change 2836358 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25710 Replaced Deprecated Nodes

Change 2836510 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25718 Adjsuted BP to make pointer decal rotate in the direction of surface

Change 2836564 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25716 Added bool to store last Moved Direction

Change 2836697 on 2016/01/20 by Taizyd.Korambayil

	#jira UE-25740 Removed unused VR Nodes to remove Log errors on Mac

Change 2836725 on 2016/01/20 by Peter.Sauerbrei

	workaround for thread race when trying to release the TargetDeviceService endpoint after an unclaim message is sent
	#jira UE-25123

Change 2836782 on 2016/01/20 by Jamie.Dale

	Added FTextLayout::AddLines

	This is similar to AddLine, however it allows you to add multiple lines in a single call, thus avoiding the re-justification cost associated with each call to AddLine.

	AddLine has also been changed to take the same structure type as AddLines (which takes an array of these structures), and the existing version of AddLine has been deprecated.

	#jira UE-24187

Change 2836801 on 2016/01/20 by Jeff.Campeau

[CL 2857187 by Matthew Griffin in Main branch]
2016-02-05 11:54:00 -05:00
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Dmitriy Dyomin
ed69c79ff7 Device output log window, currently implemented only for Android. Hidden under editor experimental settings
#jira UEMOB-39
#codereview Jack.Porter

[CL 2710794 by Dmitriy Dyomin in Main branch]
2015-09-30 03:39:09 -04:00
Nick Darnell
bdf5f2ba5f Editor - Now handling previewkeydown in the console command entry widget to prevent navigation and handle key up/down events and tab events correctly as expected for entering autocompeleted console commands.
[CL 2541781 by Nick Darnell in Main branch]
2015-05-07 17:53:02 -04:00
Jamie Dale
8319693489 Made the output log cursor grey so it's easier to see
[CL 2472924 by Jamie Dale in Main branch]
2015-03-09 15:56:34 -04: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 Hertzka
c042ddcb94 ---- Merging with SlateDev branch ----
Introduces the concept of "Active Ticking" to allow Slate to go to sleep when there is no need to update the UI.

While asleep, Slate will skip the Tick & Paint pass for that frame entirely.
- There are TWO ways to "wake" Slate and cause a Tick/Paint pass:
    1. Provide some sort of input (mouse movement, clicks, and key presses). Slate will always tick when the user is active.
        - Therefore, if the logic in a given widget's Tick is only relevant in response to user action, there is no need to register an active tick.
    2. Register an Active Tick. Currently this is an all-or-nothing situation, so if a single active tick needs to execute, all of Slate will be ticked.

- The purpose of an Active Tick is to allow a widget to "drive" Slate and guarantee a Tick/Paint pass in the absence of any user action.
    - Examples include animation, async operations that update periodically, progress updates, loading bars, etc.

- An empty active tick is registered for viewports when they are real-time, so game project widgets are unaffected by this change and should continue to work as before.

- An Active Tick is registered by creating an FWidgetActiveTickDelegate and passing it to SWidget::RegisterActiveTick()
    - There are THREE ways to unregister an active tick:
        1. Return EActiveTickReturnType::StopTicking from the active tick function
        2. Pass the FActiveTickHandle returned by RegisterActiveTick() to SWidget::UnregisterActiveTick()
        3. Destroy the widget responsible for the active tick

- Sleeping is currently disabled, can be enabled with Slate.AllowSlateToSleep cvar
- There is currently a little buffer time during which Slate continues to tick following any input. Long-term, this is planned to be removed.
    - The duration of the buffer can be adjusted using Slate.SleepBufferPostInput cvar (defaults to 1.0f)

- The FCurveSequence API has been updated to work with the active tick system
    - Playing a curve sequence now requires that you pass the widget being animated by the sequence
    - The active tick will automatically be registered on behalf of the widget and unregister when the sequence is complete
    - GetLerpLooping() has been removed. Instead, pass true as the second param to Play() to indicate that the animation will loop. This causes the active tick to be registered indefinitely until paused or jumped to the start/end.

[CL 2391669 by Dan Hertzka in Main branch]
2014-12-17 16:07:57 -05:00
Richard TalbotWatkin
ada57983a2 Fixed issue with output log sometimes not auto-scrolling to bottom.
#jira UE-6669 - Editor: Output Log window sometimes doesn't auto-scroll-to-bottom

[CL 2390839 by Richard TalbotWatkin in Main branch]
2014-12-17 02:15:54 -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
Jamie Dale
7775242a93 Fixed output log performance degradation as new text was added
UETOOL-129 - Investigate SOutputLog performance degradation

FTextLayout::AddLine was causing a re-flow of the entire document when a new line was added. This change makes it only flow the line that is being added (providing the rest of the layout is already up-to-date).

ReviewedBy Justin.Sargent

[CL 2363200 by Jamie Dale in Main branch]
2014-11-18 06:25:21 -05:00
Michael Noland
6e79b18ad4 Editor: Fix crash during shutdown with log timestamps
[CL 2357800 by Michael Noland in Main branch]
2014-11-12 20:01:49 -05:00
Mikolaj Sieluzycki
462bb3edc1 Prepare cpp files for header cleanup.
#codereview Robert.Manuszewski

[CL 2356890 by Mikolaj Sieluzycki in Main branch]
2014-11-12 05:28:51 -05:00
Michael Noland
897c2880b4 Editor: Fix Clang error with ? of dissimilar types
[CL 2355272 by Michael Noland in Main branch]
2014-11-10 18:29:57 -05:00
Michael Noland
6d2b7ff428 Editor: Add LogTimestampMode editor config setting to control how timestamps are displayed in the output log (still defaults to None)
[CL 2354931 by Michael Noland in Main branch]
2014-11-10 15:13:41 -05:00
Jamie Dale
588dfdfcf0 Removed some redundant focus switching code from the output log
This was causing the focus to ultimately switch back to the widget that was already focused, however it was also causing IMEs to lose their current context. This force focus isn't needed, as the suggestions list is already set to not take focus when it's spawned.

[CL 2350270 by Jamie Dale in Main branch]
2014-11-05 13:12:41 -05:00
Chris Gagnon
0e6d657c3d Refactor to unify keyboard and controller input and focus.
Native controller navigation support.

[CL 2345039 by Chris Gagnon in Main branch]
2014-10-30 12:29:36 -04:00
Matt Kuhlenschmidt
b2d573aa0d Fix crash typing in the output log when a PIE window is open
[CL 2344902 by Matt Kuhlenschmidt in Main branch]
2014-10-30 10:18:39 -04:00
Jamie Dale
7dfea2d544 Fixed a crash when the TSF IME API tried to get the selected text from SOutputLog
FOutputLogTextLayoutMarshaller::GetText wasn't implemented, so it was always returning an empty string. I've implemented this and verified that it doesn't cause any performance issues for the output log.

I had to change SMultiLineEditableText::LoadText to only do that when it was bound to a delegate, as that was causing a hitch while the output log was updated when you gave it focus.

I also fixed giving the output log focus sometimes jumping to the top of the log (SMultiLineEditableText::OnKeyboardFocusReceived needed the same fix as SMultiLineEditableText::OnKeyboardFocusLost to prevent the cursor jumping into focus).

ReviewedBy Justin.Sargent

[CL 2308259 by Jamie Dale in Main branch]
2014-09-24 09:59:43 -04:00
Jamie Dale
22f0534844 Removed Tick() from SOutputLog
It wasn't actually needed as we're able to perform the scroll immediately in all cases we need to, rather than wait until the next Tick().

#codereview Max.Preussner

[CL 2306688 by Jamie Dale in Main branch]
2014-09-23 06:03:13 -04:00
Jamie Dale
6da78431f0 Some usability improvements for the output log
1) The selected text colour is now easier on the eyes
2) The output log will always scroll to the end when you enter a command
3) The output log will now correctly scroll to the bottom when it is first opened (it forces the scrollbars to always visible to avoid the horizontal scrollbar being able to move the vertical scrollbar up slightly from the bottom of the log)

ReviewedBy Andrew.Rodham

[CL 2305438 by Jamie Dale in Main branch]
2014-09-22 09:46:08 -04:00
Jamie Dale
57f0bee6b0 Fixed auto-scrolling not working after clearing the output log
ReviewedBy Rob.Jones

[CL 2298082 by Jamie Dale in Main branch]
2014-09-15 09:30:39 -04:00