Commit Graph

133 Commits

Author SHA1 Message Date
David Ratti
452e758e86 [AUTOMERGE]
alphabetize gameplay tags imported from INI file

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2602290 by David.Ratti on 2015/06/26 11:12:23.

[CL 2602298 by David Ratti in Main branch]
2015-06-26 11:13:46 -04:00
Dan Oconnor
96c7289b88 [UEBP-59] Optimize Blueprint loading done subsequently to initializing the blueprint action database, by decreasing the number of TObjectIterators we use to build the database.
[CL 2592248 by Dan Oconnor in Main branch]
2015-06-18 13:40:47 -04:00
David Ratti
87108141b0 Merge missed changes to GameplayAbilitiesEditor.Build.cs
[CL 2590855 by David Ratti in Main branch]
2015-06-17 16:20:16 -04:00
David Ratti
c19c72aa4c [AUTOMERGE]
update default gameplay cue notify path to be valid

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2590115 by David.Ratti on 2015/06/17 10:46:40.

[CL 2590117 by David Ratti in Main branch]
2015-06-17 10:47:15 -04:00
David Ratti
afef12bff3 [AUTOMERGE]
GameplayCue Editor improvement pass:

* I switched this to use a TreeView instead of nested ListViews.
   * This fixes the scrolling bug that Dave mentioned where some items were missing until you scrolled.
   * Currently automatically expand any items that have handlers. Do we want that?
   * We could organize the tags hierarchically. Would that be useful?
* Instead of double-clicking, handlers are now Hyperlinks for more obvious navigation.
* Added search button to suggest that you have to hit [Enter] or click the button for search to actually take place.
* Search highlights matching substring as a reminder that a search is active (i.e. you are not seeing all the items).
* Known Issue : Right now after clicking [Add New] to add a handler, you have to press [Search] before it to shows up.
* Now uses SUserWidget pattern

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2586937 by Nick.Atamas on 2015/06/13 14:43:29.

[CL 2587459 by David Ratti in Main branch]
2015-06-15 12:02:38 -04:00
Marc Audy
0615fa47e1 Fix non-unity
#codereview David.Ratti, Andrew.Rodham

[CL 2585671 by Marc Audy in Main branch]
2015-06-12 10:29:27 -04:00
Dmitriy Dyomin
d044939cd5 Fix for gameplay abilities linking
[CL 2585307 by Dmitriy Dyomin in Main branch]
2015-06-11 22:46:01 -04:00
David Ratti
b5f17fdf89 [AUTOMERGE]
GameplayCue Editor tool first pass

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2583077 by David.Ratti on 2015/06/10 14:39:58.

[CL 2585143 by David Ratti in Main branch]
2015-06-11 18:47:26 -04:00
Jamie Dale
fe2c01e3c0 Ensured that everything in the editor using a TTextFilter is reporting syntax error information back to the user
[CL 2582959 by Jamie Dale in Main branch]
2015-06-10 13:22:27 -04:00
Eric Newman
f3569dae41 Fortnite dev to main merge up to cl # 2564489
Merging using UE4-Fortnite-To-UE4

[CL 2573959 by Eric Newman in Main branch]
2015-06-02 11:44:27 -04:00
Jamie Dale
837ec025dd Added overrides for GetToolkitToolTipText where required
UE-16078 - Crash hovering over texture reference in material

A lot of asset editors were overriding GetToolkitName to implement custom logic (sometimes because the default logic would cause a crash), and these asset editors now also need to override GetToolkitToolTipText too.

[CL 2564832 by Jamie Dale in Main branch]
2015-05-26 09:14:55 -04:00
Richard TalbotWatkin
5608d150bf Fixed issue where creating a child of an anim blueprint would result in a regular blueprint being created. Also fixed a similar issue with GameplayAbilityBlueprints.
#jira UE-15787 - Creating a child blueprint of an anim blueprint does not result in an anim blueprint
#reviewedby Benn.Gallagher

[CL 2558443 by Richard TalbotWatkin in Main branch]
2015-05-20 07:23:37 -04:00
David Ratti
e58903db9a [AUTOMERGE]
null check

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2557572 by David.Ratti on 2015/05/19 15:55:56.

[CL 2557573 by David Ratti in Main branch]
2015-05-19 15:56:26 -04:00
Laurent Delayen
f635d52081 Fortnite Dev > Main Integration from CL #2535376
UE4-Fortnite-CL-2535376
CL# 2535376
MCP CL# 2532705
Linux Dedicated Server
Backend: Testing
  "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "buildDate" : "2015-05-01T13:57:06.985Z",
  "serverDate" : "2015-05-04T13:50:47.828Z",
  "build" : "1306",
  "cln" : "2532705",
  "overridePropertiesVersion" : "unknown",
  "version" : "UNKNOWN"

[CL 2539301 by Laurent Delayen in Main branch]
2015-05-06 11:05:00 -04:00
Maciej Mroz
0945f3739e UE-14868 Adding new, Async Proxy output pin to UK2Node_BaseAsyncTask messed up AbilityTasks that spawn actors
#codereview Mieszko.Zielinski, David.Ratti

[CL 2535350 by Maciej Mroz in Main branch]
2015-05-03 20:59:40 -04:00
Jaroslaw Palczynski
85d159e467 Making the comment more general.
#codereview David.Ratti

[CL 2528164 by Jaroslaw Palczynski in Main branch]
2015-04-28 04:27:43 -04:00
Michael Schoell
63b7360ae0 Removed the Blueprint Editor's legacy node menu system.
#jira UE-13391 - Delete old BP menu system (is causing confusion)

#codereview Mike.Beach

[CL 2514361 by Michael Schoell in Main branch]
2015-04-16 11:47:54 -04:00
Fred Kimberley
3561bb7571 Spot integration of CL 2504277.
Removed deprecated Duration variable and associated code from UGameplayEffect.

[CL 2505647 by Fred Kimberley in Main branch]
2015-04-08 15:10:23 -04:00
Dan Oconnor
c26cddcf53 [UE-13143] - Disabling references to blueprint defined properties because the pointers go stale and crashes occur. This has never worked, except possibly during the editor session in which the reference is assigned.
[CL 2500497 by Dan Oconnor in Main branch]
2015-04-02 18:34:36 -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
PaulEremeeff
3d878d5a79 PR #996: Fixing PVS-Studio warnings (Contributed by PaulEremeeff)
I have reviewed each change carefully, but it is a large change and I could have missed something! Here is a summary of the types of changes in this CL:
 * Made nullptr checks consistent (the plurality of the changes are of this type)
 * Completed switch statements (IE, switch did not explicitly handle default case, but had unhandled enum entries - this is the second most popular type of fix)
 * Removed unused variables
 * Removed redundant initializations
 * WidgetNavigationCustomization.cpp was fixed by the owner
 * integers converted to floats where result was stored in a float
 * Removed redundent null checks (e.g. before delete statements)
 * Renamed variables to prevent non-obvious shadowing
 * Fixed use of bitwise & when checking for equality to an enum entry (which is often 0)
 * Fixes for some copy paste errors (e.g. FoliageEdMode.cpp)

[CL 2498053 by Dan Oconnor in Main branch]
2015-03-31 20:12:31 -04:00
Dan Oconnor
195086b1a5 Changes from PVS-Studio, these could introduce small behavior change.
Consistent null checks, fixes for copy/pasted conditions, copy pasted LOCTEXT identifiers, comparisons against literals of the wrong type, missing return statements, dead code, and some system calls that were ignoring their return value

[CL 2494390 by Dan Oconnor in Main branch]
2015-03-27 16:11:50 -04:00
Jaroslaw Palczynski
28fc7695a0 Missing chages for 2481343.
Some P4V problem with backing out large changelist missed some files.

#codereview Robert.Manuszewski

[CL 2481366 by Jaroslaw Palczynski in Main branch]
2015-03-17 06:17:32 -04:00
Jaroslaw Palczynski
f23f29257b Back out changelist 2481333
Rob asked me to back out GENERATED_*_BODY -> GENERATED_BODY change for now until the "_Validate and _Implementation auto-generation" discussion is over.

#codereview Robert.Manuszewski

[CL 2481343 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:38:32 -04:00
Jaroslaw Palczynski
fa31560e2d Enabled UHT to digest GENERATED_BODY instead of GENERATED_UCLASS_BODY, GENERATED_USTRUCT_BODY, GENERATED_UINTERFACE_BODY or GENERATED_IINTERFACE_BODY, changed every occurence to the new syntax and fixed every warning that have fallen out of this change.
#codereview Robert.Manuszewski

[CL 2481333 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:19:11 -04:00