Commit Graph

24 Commits

Author SHA1 Message Date
Fred Kimberley
739ee0d8e9 Merging using UE4-Fortnite-To-UE4
Merged from CL 221481.

[CL 2227500 by Fred Kimberley in Main branch]
2014-07-22 16:23:09 -04:00
Bob Tellez
a399d885b6 Merging CL#2188206 using UE4-Fortnite-To-UE4
MCPInfo:
  "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "build" : "240",
  "cln" : "2172251",
  "version" : "UNKNOWN"

[CL 2215307 by Bob Tellez in Main branch]
2014-07-14 19:41:38 -04:00
John Abercrombie
50135a2e60 (UE4-Fortnite -> UE4) Merge everything using UE4-Fortnite-To-UE4 at QA approved cl# 2126954
[CL 2170904 by John Abercrombie in Main branch]
2014-07-07 17:19:49 -04:00
Mikolaj Sieluzycki
de6a6e0c8f Back out changelist 2121706
[CL 2121856 by Mikolaj Sieluzycki in Main branch]
2014-06-30 10:25:10 -04:00
Mikolaj Sieluzycki
1bb08f711a Remove superfluous headers, part 1 of n.
#codereview Robert.Manuszewski

[CL 2121706 by Mikolaj Sieluzycki in Main branch]
2014-06-30 06:39:08 -04:00
Andrew Brown
97baebcdae Asset View now supports secondary sorting
#UDN: Feature suggestion; Content browser can sort by a second column

#branch UE4

#change
Added two new images for secondary sort ascending and descending.
(Updated styles where needed).

Added new enum EColumnSortPriority: currently only lists Primary and Secondary, but can easily accommodate more*.
(FOnSortModeChanged was modified to also have the priority as a param, fixedup existing usage).

SHeaderRow now also has a SortPriority attribute to specify the SortMode order
(Defaults to Primary if unused).

Modified TUniquePtr so that assigning one from another worked correctly.
(Reviewed by Steve Robb).

SAssetView is the only table that has been modified, so far, to take advantage of the secondary sort. SetMajorityAssetType has been updated to correctly filter out all those sorts which are no longer relevant and bump the priority of the remaining sorts to fill in the ægapsÆ made by non-longer-relevant ones.

FAssetViewSortManager has been overhauled to take SortPriority into consideration when sortingà
Firstly, duplicate comparison structs were removed in favour of single structs which have æascendingÆ as a paramà any remaining duplicate code was removed in favour of an inherited usage. The base struct has an array of æfurther methodsÆ to employ in the result of a tie. Should a tie occur the ænextÆ comparison is done, and so on until itÆs not a tie or we run out of comparisons to perform.*
The manager defaults to having no secondary sort, so it relies on the interface thatÆs using it to provide it.
Whenever a column is assign the code makes sure that itÆs not already assigned to another column and corrects the order to take this into account.

Fixed a bug in FCompareFAssetItemByTagNumericalAscending comparing A with A (instead of B).
Various optimizations to the sort to descrease times

*The only places æSecondaryÆ is referred to in code is in GetSortingBrush (so it can display the correct icon for the sort), and OnTitleClicked (so it can set to correct sort based on input). The sorting code itself has no concept as to a secondary sort, it can support any number of sorting levels so if in future a tertiary (or more) is added, it is only these two function which should need updating as the sort will automatically accommodate it.

reviewed by Thomas.Sarkanen, Bob.Tellez

[CL 2119201 by Andrew Brown in Main branch]
2014-06-27 04:30:08 -04:00
Laurent Delayen
7ea3ae79c6 Fixed a few warnings missed during the integration.
[CL 2118651 by Laurent Delayen in Main branch]
2014-06-26 17:57:07 -04:00
Laurent Delayen
a377ef0cf4 Dev to Main from cl #2110143
[CL 2118596 by Laurent Delayen in Main branch]
2014-06-26 17:26:58 -04:00
sebastian kowalczyk
aaa7d2d093 Removed FLogVisualizer (and other parts of visual logger) from compilation for builds with disabled logging #UE4
It fixes TTP #313754 "FLogVisualizer is being compiled when NO_LOGGING is defined"

[CL 2117823 by sebastian kowalczyk in Main branch]
2014-06-26 06:25:26 -04:00
Mieszko Zielinski
3db83643db Fixed some coding style offenders in LogVisualizer module #UE4
[CL 2113954 by Mieszko Zielinski in Main branch]
2014-06-23 10:24:03 -04:00
Bob Tellez
d45afc096c Merging using CL#2104122 UE4-Fortnite-To-UE4
[CL 2107706 by Bob Tellez in Main branch]
2014-06-16 23:03:48 -04:00
sebastian kowalczyk
11f70e150d Fixed differen issues for GameplayDebugger and fixed missing features we had before moving to separate module.
[CL 2101734 by sebastian kowalczyk in Main branch]
2014-06-11 09:13:09 -04:00
Eric Newman
43162b12dc Weekly UE4-Fortnite=>UE4 merge using UE4-Fortnite-To-UE4 of approved cl# 2098745
[CL 2100757 by Eric Newman in Main branch]
2014-06-10 16:45:28 -04:00
sebastian kowalczyk
bcf63d6e0f Moved Gameplay Debugging Tool to separate module. It's GameplayDebugger module now. Will have to bring back some functionality later (connection with BT debugger, etc.) #ue4
[CL 2100589 by sebastian kowalczyk in Main branch]
2014-06-10 13:56:35 -04:00
Mieszko Zielinski
3d8938a8ab Added a little sanity check preventing LogVisualizers from crashing when deleting vlogs #UE4
[CL 2099002 by Mieszko Zielinski in Main branch]
2014-06-09 11:12:52 -04:00
Marc Audy
64c64f75d2 Shadow variable fixes
[CL 2095896 by Marc Audy in Main branch]
2014-06-05 12:16:00 -04:00
Billy Bramer
08ee797eb8 Merging using UE4-Fortnite-To-UE4 up to CL 2082758
Includes following engine CLs:

CL 2080462:
Added verbosity selection to category filters in Log Visualizer window

CL 2081939:
Fixed crash in Log Visualizer and missing entry on timeline with log containing only 2 entries.

CL 2082118:
Fixes and improovements for VisLogs
- fixed logs visualization for logs with only one entry (Log Visualizer window)
- fixed logs spam about missing json field  (Log Visualizer window)
- fixed crash with categories in Log Visualization window
- added category and verbosity serialization for vislog shape elements (vlog files)

CL 2080253:
Added categories to VisLog shapes

CL 2081762:
Fixes to Log Visualizer. Logs without any log lines but with geometry elements are set on timeline properly.

CL 2081859:
Added double click to Log Visualizer action, to move editor camera to view current log location

CL 2080159:
Gameply Tag Pin now only allows single select
#TTP 335383 - Editor: GameplayTag Pin should only allow a single selection
#proj UE4
#change Removes all other tags from the correct container when in single select mode, was a missed variable change from a previous TTP

CL 2081306:
Made changes to navigation filters that allow for usage of virtual verstion dtQueryFilter #UE4
The scary part here is that having a dtQueryFilter contan a vftable was messing up FRecastQueryFilter's vftable it was getting from INavigationQueryFilterInterface. Reversing order of parent clas declaration of FRecastQueryFilter fixed the issue, but it's scary and looks like a compiler issue.

[CL 2088758 by Billy Bramer in Main branch]
2014-05-29 17:46:51 -04:00
Michael Trepka
8671a16e29 Renamed SFilter and SFilterList classes in LogVisualizer to solve linking conflicts on Mac
[CL 2083388 by Michael Trepka in Main branch]
2014-05-29 16:52:25 -04:00
Ben Zeigler
3f7149bdb0 Merging using UE4-Fortnite-To-UE4 Up to Changelist #2080066
[CL 2082174 by Ben Zeigler in Main branch]
2014-05-22 14:14:52 -04:00
Bob Tellez
5005cdb1f5 Merging Dev->Main CL#2066578 using UE4-Fortnite-To-UE4.
[CL 2073265 by Bob Tellez in Main branch]
2014-05-14 15:00:32 -04:00
Fred Kimberley
25ab7d8e19 Merging using UE4-Fortnite-To-UE4 using CL 2065232.
[CL 2066377 by Fred Kimberley in Main branch]
2014-05-07 20:37:19 -04:00
Bob Tellez
96c40b8974 Merging UE4-Fortnite -> Main using CL#2047477
[CL 2049479 by Bob Tellez in Main branch]
2014-04-23 19:29:53 -04:00
Justin Sargent
0bc686f251 Fixed up redundant FText .ToString() usage and some improper FText usage.
[CL 2042623 by Justin Sargent in Main branch]
2014-04-23 18:06:41 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00