Commit Graph

55 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
Carlos Cuello
8c5c68ef7e [INTEGRATE] Merging using UE4-To-UE4-LauncherDev, integrate all from LauncherDev up to cl 2499790, more party changes portal related bug fixes
[CL 2499915 by Carlos Cuello in Main branch]
2015-04-02 11:07:03 -04:00
Carlos Cuello
65c6b1a695 [INTEGRATE] Merging using UE4-To-UE4-LauncherDev, integrate all up to cl 2496104 from the LauncherDev branch. updated friends and chat module, lib curl updates, portal related fixes
[CL 2499790 by Carlos Cuello in Main branch]
2015-04-02 09:42:37 -04:00
Nicholas Davies
b60f094b31 [INTEGRATE] merge ue4-launcheDec->ue cl cl 2495460 & Cl 2490409
Fixed #jira FORT-6495 MAIN: In-game chat is not functioning

[CL 2495486 by Nicholas Davies in Main branch]
2015-03-30 06:36:06 -04:00
Antony Carter
059e312214 [INTEGRATE] merge ue4-UT->ue4 FriendsAndChat Module
#proj Portal

#codereview Nicholas.Davies, Sam.Zamani

[CL 2481667 by Antony Carter in Main branch]
2015-03-17 11:47:53 -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
Carlos Cuello
6f1ac76399 [INTEGRATE] UE4-LauncherDev->UE4 integrate all up to cl 2475889
[CL 2478426 by Carlos Cuello in Main branch]
2015-03-13 08:26:18 -04:00
Bob Tellez
a0978f8b96 Merging Dev->Main up to CL#2467337 using UE4-Fortnite-To-UE4.
* CL#2446826 Lukasz.Furman
Back out changelist 2445212

Broken direct paths to goal, will fix it soon.

* CL#2446871 Lukasz.Furman
fixed path updates of direct path (FAbstractNavigationPath)
#fortnite

* CL#2447293 John.Abercrombie
Resubmit CL 2443888
- Looks like things are working correctly, potentially due to my changes in CL 2444830

(Back out changelist 2443888 - which backed out CL 2443888 originally)

* CL#2447787 Ben.Zeigler
#UE4 Fix for cooking gameplay cue notifies, keep hard references to them during cooking as they get GCd out otherwise

* CL#2448460 Lukasz.Furman
added cleanup for duplicated subtree assets on behavior tree graph save
#fortnite

* CL#2449132 David.Nikdel
#UE4 #DataTable #JSON: Added WriteRowAsJSON to serialize a single row from a table to Json and adjusted WriteTableAsJSON to use this internally

* CL#2449208 Fred.Kimberley
Fix crashes when compiling some blueprints.
A recent change (2447719) added a one frame delay during blueprint compiling where some data may be NULL. Added null checks to handle this situation.

#ue4

* CL#2449329 Josh.Andersen
#engine - Added more info to an assert that can happen in an animsequence at runtime.

* CL#2449869 sebastian.kowalczyk
Changed timer in visual logger to use FTimerHandle.
Fixed possible issue with missing log on LogVisualizer timeline.

* CL#2450394 John.Abercrombie
Part of the fix for FORT-4986 - Blaster will become inactive towards a specific player if player goes out of range during the blasters attack.
- The set next montage section and wait was using callbacks from the end of the animation, rather than when it is blended out
- Fixed up function names to match the functionality of animations blending out rather than the animation ended

* CL#2451683 Josh.Andersen
#engine - Enhanced PlaySlotAnimation by allowing looping counts as a parameter.  Enhanced StopSlotAnimation by adding the ability to stop only a specific slot node.

* CL#2452151 Ben.Zeigler
#UE4 Fix ability block tags to correctly handle parent expansion, we want to expand the parents of the ability we're checking, not the blocked tags
Fix it so AbilitySystemComponent::PlayMontage correctly sets the start section if called on a predicted client

* CL#2452733 Ben.Zeigler
#UE4 Fix replication bug where an actor without a root component was treated as being at 0,0,0 for computing net priority, leading to different priority based on facing direction

* CL#2453024 Lukasz.Furman
added navigation filter to EQS pathfinding tests

* CL#2453422 Ben.Zeigler
#UE4 Fix bug with FGameplayTagCountContainer, where if you added A, then A.B, then removed A, then removed A.B, A would still be in the explicit tag list. Switch to using a separate map for explicitly added tags

* CL#2453874 Josh.Markiewicz
#UE4 - check that the http module is available before attempting to remove pending http requests in mcp
- prevents an assert in the http module that it was unloaded based on shutdown order of modules and timing of pending requests at shutdown

* CL#2453906 Josh.Markiewicz
#UE4 - added IsValid function to party reservation structure
- added a few more checks to validate input on reservation request
- prevent empty or invalid reservation ids on reservation requests

* CL#2454211 Bob.Tellez
#UE4 CategoryText for tags that were added by being parent tags of others is now properly registered when inserting tags into the tag manager tree.

* CL#2454353 Billy.Bramer
- Fixes for issues in GE pending list implementation:
   - PendingAdds could become out of sync due to additional removals or additions occuring during a scope lock; Removed pending add integer optimization to guarantee accuracy
   - GetActiveGameplayEffect(Idx) could return results in the pending list that weren't actually being actively used at the moment
   - RemoveActiveEffects needs to scope lock because removals can cause additional removals earlier in the array

* CL#2454740 Laurent.Delayen
Fixed SlotNode being registered multiple times when inside of a State.
(Triggered by FAnimNode_StateMachine::SetState)

* CL#2455611 Ben.Zeigler
#UE4 Changes to GameplayCue handling to improve network performance:
Add wrapper to FGameplayCueManager to handle batching together Execute gameplay cues.
FScopedGameplayCueSendContext can be used to create a batched context, cues created during that period will all be sent after the context falls out of scope.
Subclasses of GameplayCueManager can implement ProcessPendingCueExecute to do processing on the execute cues before networking and display.
Fixed bug where Remove cue events would be sent twice for loose cues, deleted the RPC.
Fixed bug where WhileActive/Removed cue events would happen twice on a predicted client

* CL#2455653 Ben.Zeigler
#UE4 Add code to support checking networking conditions like OwnerOnly for custom delta serialization used by fast tarray serialization. They were ignored before and it always replicated.

* CL#2455995 Lukasz.Furman
fixed losing pending task execution data after failed search attempt

* CL#2456247 John.Abercrombie
- The FBlackboardKeySelector ActorToCheck's KeyID is an invalid value for some reason (only occurs in cooked content)
- Made it so if we detect an invalid KeyID we get the correct KeyID at runtime
- This could be causing problems elsewhere, but it'll at least fix this particular issue on AIs for now
- Not marking the bug fixed because it needs a real fix, this code will be removed.  Passing to Lukasz.

* CL#2456854 John.Abercrombie
Fixed crash when writing to VLog while it was making a string with invalid data

* CL#2457309 Eric.Newman
Don't update LastUserInteractionTime for WindowActivated events unless it was mouse triggered.
This fixes an issue where "kicked from game" popups would cause the user to be treated as active.

* CL#2457658 Sammy.James
Double-Deferred Slate Widgets will now properly render :)

* CL#2458196 Lukasz.Furman
proper fix for UBTDecorator_CheckGameplayTagsOnActor

* CL#2458334 sebastian.kowalczyk
Fix for issue "Pause does not stop the Visual Logger from recording data while PIEing with dedicated server".

* CL#2459893 Billy.Bramer
[FORT-6059] Add GE removal tech necessary to support Phil fixing AE damage clouds
- Add RemoveActiveGameplayEffectBySourceEffect to ability system component (implemented via CustomMatch delegate in query so as to avoid risking query changes before OT2; query needs a refactor in general)
- Change CustomMatch query delegate to take the active effect by reference instead of making copies
- Fix bug with stacking where the stacking limit could be completely ignored on aggregate by target stacks if the newly added effect didn't have a valid instigator ASC (can happen on delayed application like via projectiles)

* CL#2462362 Daniel.Broder
Minor cleanup while investigating a crash:

In FBlueprintVarActionDetails::PopulateCategories:
* Split up check with && into two separate checks so the exact issue can be seen
* Replaced repeated calls to MyBlueprint->GetBlueprintObj() with Blueprint, which already existed and was already assigned to that value.
* Made a few spacing discrepancies consistent within the function.

* CL#2462580 John.Abercrombie
Added a decorator that can set a tag cooldown but does not test affect BT execution flow

* CL#2463013 John.Abercrombie
Added extra info to VLog when we need to smash something as part of our path.
- Exposed the PathFollowing log category outside of the AI Module

* CL#2463138 Josh.Markiewicz
#UE4 - found some compile errors when LOG_SLATE_EVENTS is 1
- doesn't actually make it work, but they were compile errors

* CL#2464208 Ben.Zeigler
#UE4 Flush MustBeMappedGUIDs list after flushing dormancy, those avoids warnings the next time something is replicated

* CL#2464231 Josh.Markiewicz
#UE4 - added more descriptions to party beacon return results

* CL#2466155 Lukasz.Furman
added batch pathfinding test for EQS

* CL#2466237 Lukasz.Furman
EQS generators will now cache NavLocation of items if navmesh projection is enabled

* CL#2466356 Lukasz.Furman
added support for deprecated nodes in EQS editor

* CL#2466358 Lukasz.Furman
pathing grid EQS generator is now deprecated

* CL#2466439 Lukasz.Furman
added failsafe in EQS editor for recreating missing nodes

* CL#2466643 Josh.Markiewicz
#UE4 - removed cached "is talking" value as it doesn't persist across various travel mechanisms.  Start/StopTalking handle their own state.

* CL#2466813 Laurent.Delayen
Fix for weapons not showing aiming angle on simulated proxies.

* CL#2467308 Bob.Tellez
#UE4 Fixed an issue where when following a redirector, a non-PIE world will be changed to the PIE world type. Also removed some log spam related to worlds while streaming.

[CL 2474673 by Bob Tellez in Main branch]
2015-03-10 21:41:11 -04:00
Bob Tellez
83729cb772 #UE4 Now displaying the global chat button only if global chat is enabled.
[CL 2459046 by Bob Tellez in Main branch]
2015-02-24 15:25:50 -05:00
Eric Newman
2e0faae848 Merging social fixes from //depot/UE4-Fortnite/... to //depot/UE4/...
Changelists 2411337,2414292,2428899,2430335,2433660,2434546,2435756,2438661,2439790,2444814,2444819,2444840,2444841,2445207,2445270

[CL 2452515 by Eric Newman in Main branch]
2015-02-19 18:53:47 -05:00
Antony Carter
f647d11dd5 [INTEGRATE] merge ue4-launcherdev->ue4 cl 2439794 - 2440525
[CL 2440649 by Antony Carter in Main branch]
2015-02-10 18:36:38 -05:00
Chris Wood
c80cffe452 Merge FriendsAndChat UE4-LauncherDev => UE4 (main) upto CL 2436945
[CL 2439641 by Chris Wood in Main branch]
2015-02-10 06:44:35 -05:00
Max Preussner
256933f5ab Merging using UE4-To-UE4-LauncherDev, up to CL 2431138
#CodeReview: carlos.cuello

[CL 2431178 by Max Preussner in Main branch]
2015-02-04 00:28:16 -05:00
Ben Marsh
e9a5f79d69 [INTEGRATE] Change 2416860 by Ben.Marsh@Ben.Marsh_T3245_Clean on 2015/01/23 10:23:13
[INTEGRATE] Change 2416366 by Sam.Zamani@SZAMANI-Z2420_UE4-NEW on 2015/01/22 22:06:42

		#online,mcp,friends
		- removed direct mcp dependencies from public friends/chat module
		- user mapping via persona service exposed from existing onlineuser interface

		#codereview: steve.polge, peter.knepley, james.hopkin

[CL 2419640 by Ben Marsh in Main branch]
2015-01-26 19:45:30 -05:00
Chris Wood
a0b6f674a9 Integrate - UE4-Fortnite => UE4
CL 2407159 - Fortnite/Portal: FriendsAndChat - Changed friends list background to the regular Fortnite window background pattern.
CL 2413625 - Fortnite/Portal: FriendsAndChat - Converted friend action buttons/menus into SFriendsAndChatCombo buttons and matched visual style to the online status button. Added placeholder versions to Portal so UI is working as before.

[CL 2415354 by Chris Wood in Main branch]
2015-01-22 11:12:18 -05:00
Stephan Delmer
6f7661f391 Merging using UE4-Fortnite-To-UE4 from CL 2403093
[CL 2407402 by Stephan Delmer in Main branch]
2015-01-15 11:57:16 -05:00
Chris Wood
0f19fe72dd Integrate - UE4-Fortnite => UE4
CL 2399948 -  Fortnite/Portal: FriendsAndChat - Added SFriendsAndChatCombo widget class to mimic SFortDropdown. It's a combo button with custom visuals. It is now used in the online status button which is used in Fortnite and in the UnrealEngineLauncher.

[CL 2403267 by Chris Wood in Main branch]
2015-01-12 06:27:24 -05:00
bruce nesbit
6f095f81dc Added asset/class field to manifest
Added display of asset/class info used to Add Content dialog
Fixed several cut/pasted comments regarding UMG styles that referred to shooter game

[CL 2392502 by bruce nesbit in Main branch]
2014-12-18 10:27:15 -05:00
Nicholas Davies
8d3729ee97 #FriendsAndChat - Merge from Fortnite Dev
[CL 2391367 by Nicholas Davies in Main branch]
2014-12-17 12:42:40 -05:00
Chris Wood
70aa49fc9c Integrate - UE4-Fortnite => UE4
CL 2381661 -  Fortnite Chat/Friends: Added minimum size and 'Add Friends' message to empty friends list panel.
CL 2388456 - Fortnite/Portal: FriendsAndChat - UI updates to match mockups. Online status button style changed. Added friend action dropdown button and inline actions to friend items. Various additional style tweaks. Adjusted portal friends window and style to work with these changes too.
CL 2388970 - Fix Mac/Linux builds of Fortnite editor

[CL 2391256 by Chris Wood in Main branch]
2014-12-17 11:22:54 -05:00
John Abercrombie
4e9ac6444a Merging using UE4-Fortnite-To-UE4 @ CL 2382284
[CL 2388856 by John Abercrombie in Main branch]
2014-12-15 15:29:48 -05:00
Nicholas Davies
f7e3cd7135 #FriendsAndChat - Merge from Fortnite
[CL 2383859 by Nicholas Davies in Main branch]
2014-12-10 13:14:16 -05:00
Nicholas Davies
d08ea37c5e #FriendsAndChat - Update to Friends notifications. Change Fortnite notification to a bang. Addind customized notifications to Fortnite and the Launcher
[CL 2379983 by Nicholas Davies in Main branch]
2014-12-08 04:45:45 -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