Commit Graph

37 Commits

Author SHA1 Message Date
Daniel Broder
8ea8f8d7ad Merging using UE4-Fortnite-To-UE4 using 2517024
Weekly Fortnite Dev -> Main integration.

#CodeReview Paul.Moore, Bob.Tellez

[CL 2524683 by Daniel Broder in Main branch]
2015-04-24 14:07:47 -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
Todd Eckert
79e183780f Merging Dev->Main up to CL#2479653 using UE4-Fortnite-To-UE4.
*because of tons of changes, I will supply the changelists in the email because it was too large for this checkin*

[CL 2483008 by Todd Eckert in Main branch]
2015-03-18 10:12:32 -04:00
Jamie Dale
1d8a24641d Converted Slate, SlateCore, and SlateViewer to exclusively use FText with Slate
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

[CL 2458202 by Jamie Dale in Main branch]
2015-02-24 05:57:41 -05:00
Matthew Griffin
e34e3e92dd [INTEGRATE] Change 2444700 by Nick.Darnell@Nick.Darnell_Dev on 2015/02/13 09:56:08
UE-9790 - Fixing widget reflector to not crash on UMG widgets that have no associated blueprint asset.

	#lockdown Matt.Kuhlenschmidt

[CL 2449857 by Matthew Griffin in Main branch]
2015-02-18 05:30:41 -05:00
Wes Hunt
97dbc7c4e2 Fixed WidgetReflector source navigation functionality. #BUN
* Removed SWidget:: GetCreatedInFile, GetCreatedInFileFName, GetCreatedInLineNumber.
* Added GetCreatedInLocation() -> FName as a non-redundant replacement, updated all code usages.
* This shrinks SWidget size by 16 bytes and reduces ambiguity on which ones to use.
* Implemented ToString() in terms of GetReadableLocation().
#codereview:max.preussner

[CL 2430545 by Wes Hunt in Main branch]
2015-02-03 16:41:52 -05:00
Peter Sauerbrei
392b4a54c8 CIS fix for Mac and Slate Stats
#mac

[CL 2417522 by Peter Sauerbrei in Main branch]
2015-01-23 19:08:15 -05:00
Wes Hunt
cc4ba94e58 Fix a block of code not surrounded by SLATE_STATS
#codereview peter.sauerbrei

[CL 2417484 by Wes Hunt in Main branch]
2015-01-23 18:32:55 -05:00
Wes Hunt
5e497c92d4 Added custom slate stats, removed all but top level UE4 slate stats. #BUN
* See SlateStats.h for details on the new system, which allows for full hierarchical profiling with limited overhead.
* Moved SWidget::GetVisibility() out of line so we can instrument it without a full recompile.
* Widget debug info now uses FName to store the line number of the file. Keeps it in one place and the new stats system can utilize it as an FName.
* Exposed SWidget CreatedInFile debug info as an FName so new stats system can use it.
* FSlateVertex no longer uses FVector4, which is an aligned struct. Switched to float[4] instead. Goes from 48 to 36 bytes.
#codereview:nick.atamas,matt.kuhlenschmidt

[CL 2417281 by Wes Hunt in Main branch]
2015-01-23 16:49:16 -05:00
Nick Atamas
cceb9ce530 Mergin CL 2411459, 284248 from UE4-UT/... -> UE4/...
Slate : added DemoMode visualization of slate mouse events - draw a fuchsia ring around event location.

[CL 2411513 by Nick Atamas in Main branch]
2015-01-19 17:59:39 -05:00
Nick Atamas
f5e19bef14 Slate : RelativeLayoutScale is now computed in the SlatePrepass(). ComputeDesiredSize() now takes a float parameter. API-breaking change!
[CL 2406629 by Nick Atamas in Main branch]
2015-01-14 19:04:45 -05:00
Nick Darnell
2126fe2576 Editor - The widget reflector now caches most of the information off a widget so that if the widget is destroyed after you lose focus (menus), you can still navigate to the source file where it was defined without that data disappearing.
[CL 2404789 by Nick Darnell in Main branch]
2015-01-13 11:44:52 -05:00
Nick Darnell
90e793745c Slate - ESlateCheckBoxState has been renamed to ECheckBoxState.
[CL 2384008 by Nick Darnell in Main branch]
2014-12-10 14:24:09 -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
df8547d860 Atlas visualizer improvements, and added a font atlas visualizer
Moved the existing atlas visualizer out of the Slate RHI renderer and instead made the resource manager for each renderer implement the ISlateAtlasProvider interface to provide information about its current texture atlases. FSlateFontCache implements ISlateAtlasProvider for the font atlas viewer.

Improved the atlas visualizer and added support for zooming and panning of the atlas pages. This helps greatly when viewing font atlases as they can be as large as 2048x2048.

#codereview Matt.Kuhlenschmidt

[CL 2371483 by Jamie Dale in Main branch]
2014-11-27 07:36:04 -05:00
Jamie Dale
75900308d3 Fixed code relying on SLATE_TEXT_ATTRIBUTE for SHyperlink
Made sure everything was using FText rather than FString.

[CL 2370982 by Jamie Dale in Main branch]
2014-11-26 13:56:07 -05:00
Jamie Dale
e856661aed Fixed code relying on SLATE_TEXT_ATTRIBUTE for SHeaderRow::FColumn
Made sure everything was using FText rather than FString.

[CL 2370913 by Jamie Dale in Main branch]
2014-11-26 12:46:05 -05:00
Matt Kuhlenschmidt
d647c8f5ed Fix cases of constant FName recreation in the editor which is affecting performance
[CL 2363352 by Matt Kuhlenschmidt in Main branch]
2014-11-18 09:57:20 -05:00
Eric Newman
65fa5864ff Fortnite Dev > Main Integration
Merged CL# 2352617 using UE4-Fortnite-To-UE4

[CL 2355906 by Eric Newman in Main branch]
2014-11-11 10:35:51 -05:00
Nick Atamas
5984aebe9c Slate : Added -perftest option to SlateViewer. Added button in WidgetReflector that copies Slate Perf Stats to clipboard.
#codereview Wes.Hunt

[CL 2353749 by Nick Atamas in Main branch]
2014-11-07 18:01:32 -05:00
Nick Atamas
47f9cde8d6 Slate : fixed Slate Draw Prepass only being called on top-level windows (not their children). Slate.FoldTick can now be toggle from the widget reflector.
[CL 2352458 by Nick Atamas in Main branch]
2014-11-07 09:47:11 -05:00
Nick Atamas
a0e6281f98 Slate : Slate Stats now show measurements using a monospaced font with fixed numbers of digits.
Text : FNumberFormattingOptions now provides method-chainable settings for easily creating a static const instance.

#codereview Justin.Sargent,Jamie.Dale

[CL 2350380 by Nick Atamas in Main branch]
2014-11-05 13:58:58 -05:00
Nick Atamas
fe50b7005c Slate : Added stat visualization to the widget reflector. Slate can now be easily profiled in SlateViewer. Requires adding <bCompileWithStatsWithoutEngine>true</bCompileWithStatsWithoutEngine> to a local BuildConfiguration.xml.
[CL 2350283 by Nick Atamas in Main branch]
2014-11-05 13:13:07 -05:00
Dmitry Rekman
1c54499008 Fix inconsistent case.
#codereview Nick.Darnell

[CL 2349528 by Dmitry Rekman in Main branch]
2014-11-04 23:10:35 -05:00
Nick Darnell
258685b4dc UMG - The Widget Reflector can detect UMG widgets as being different than normal slate widgets, and the source link is replaced by a link back to the blueprint asset. This enables the functionality, another coming changelist will hookup the asset loading binding in the editor.
[CL 2348470 by Nick Darnell in Main branch]
2014-11-04 11:11:50 -05:00