Commit Graph

162 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
Marc Audy
22b0c8b655 Fix compile error
#lockdown Zachary.EdgertonJones

[CL 2522275 by Marc Audy in Main branch]
2015-04-22 23:24:05 -04:00
Dmitry Rekman
c54a4c8241 Fix UnrealLauncher et al shadow variables - batch 2
#codereview Marc.Audy, Carlos.Cuello, Max.Preussner, Sam.Zamani, Justin.Sargent, Alex.Fennel
#lockdown Zachary.EdgertonJones

[CL 2522119 by Dmitry Rekman in Main branch]
2015-04-22 20:31:39 -04:00
Marc Audy
de01c45007 Fix UnrealLauncher shadow variables - batch 1
#lockdown Zachary.EdgertonJones

[CL 2522071 by Marc Audy in Main branch]
2015-04-22 20:01:57 -04:00
Nicholas Davies
6128b6fb9e [INTEGRATE] merge UE4-Fortnite->UE4 cl 2517563 & 2518880
Hide chat enty box in game after a message is sent
Hide chat box for emty strings or white spaces. Don't allow streams of white space to be sent as messages

[CL 2518885 by Nicholas Davies in Main branch]
2015-04-21 04:38:33 -04:00
Nicholas Davies
3e0db326d9 [INTEGRATE] merge Fortnite->UE4 cl 2517384
#jira n/a
Hide chat entry box in Fortnite while ingame, and we don't have focus. Otherwise it stays on-screen
#Peer Review Antony Carter

[CL 2517385 by Nicholas Davies in Main branch]
2015-04-20 06:14:06 -04:00
Wes Hunt
3387ba7331 Social.Chat.Counts -> Social.Chat.Counts.2
* pivoted the channel info into separate events, added the channel type info.
New format:
Social.Chat.Counts.2  ; note the .2 extension since the original is already in the wild.
    Name:<String>   ; will be a user name or a channel name, depending on type.
    Type:<Private|Channel> ; private chat is with one user, channel chats have more than one,
                                             ; and is named after the channel somehow (not totally sure how).
    Count:<int> ; number of chats in that channel since the last flush.
#codereview:sam.zamani,eric.newman,darren.clary

[CL 2510808 by Wes Hunt in Main branch]
2015-04-13 17:15:48 -04:00
Nicholas Davies
5b0a75f916 #jira OPP-3150 Chat options appear broken in Main after Launcher multi window updates
Fix up network chat to not allow user name to be selected

[CL 2508007 by Nicholas Davies in Main branch]
2015-04-10 03:38:06 -04:00
Nicholas Davies
0b18eef244 [INTEGRATE] merge ue4-launcheDev->ue cl 2505085 & Cl 2505126
#jira OPP-3150 Chat options appear broken in Main after Launcher multi window updates

[CL 2506482 by Nicholas Davies in Main branch]
2015-04-09 04:02:47 -04:00
Bob Tellez
9593c08c36 #UE4 Adjusting code to match what is in UE4-LauncherDev. This bug was already fixed bug perforce resolves unfixed it. Redoing the fix in main to get things in sync again. Fixes UE-13314
#lockdown Zachary.EdgertonJones

[CL 2503079 by Bob Tellez in Main branch]
2015-04-06 16:59:49 -04:00
Bob Tellez
eea209e0be #UE4 Create clan and friends factory on demand for now.
#codereview Nicholas.Davies

[CL 2501281 by Bob Tellez in Main branch]
2015-04-03 13:24:07 -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
8fe20ae82d #jira FORT-6095 MAIN: Social options to invite or join player are missing from Friends sub menu
Fixed up our combo buttons to use the new way of creating menu content
RB: Chris Wood

[CL 2499755 by Nicholas Davies in Main branch]
2015-04-02 08:58:51 -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
Josh Markiewicz
7be7a701ce [AUTOMERGE]
#UE4 - fixed GetJoinability function to return true in non JIP cases but with status flags properly set
- added bAllowInvites to GetJoinability because bInviteOnly is not enough as boolean
- added additional check to FOnlineSessionSearchResult::IsValid

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2492936 by Josh.Markiewicz on 2015/03/26 19:52:08.

[CL 2492947 by Josh Markiewicz in Main branch]
2015-03-26 19:57:33 -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
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
Chris Wood
b0ccbff546 #fortnite FORT-6093 - MAIN: Client crashes after accepting an Invite to Game
- fixed missing FriendsAndChat styling params and assets for Fortnite.
 - fixed missing null check in FFriendsAndChatManager::AcceptGameInvite() and FFriendsAndChatManager::JoinGameAllowed() to stop crash.

[CL 2462101 by Chris Wood in Main branch]
2015-02-26 09:22:55 -05: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
Laurent Delayen
e586cd3a8f Dev to Main integration from CL #2446290
[CL 2456855 by Laurent Delayen in Main branch]
2015-02-23 15:58:14 -05:00