Commit Graph

29 Commits

Author SHA1 Message Date
Nicholas Davies
5cd8b0d5cd #FriendsAndChat - Merge from Fortnite Dev
[CL 2408759 by Nicholas Davies in Main branch]
2015-01-16 09:08:08 -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
Nicholas Davies
76bff792bd #FriendsAndChat - Merge from Fortnite Dev
[CL 2388904 by Nicholas Davies in Main branch]
2014-12-15 15:30:36 -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
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Nicholas Davies
3f3c00445a Fix up message caps for different message types. Fixed a party chat message display issue. Changed the list view to use chat item view models provided from the manager. Fixed an issue with non-friends selected action changes when a friend status changes
#jira n/a

[CL 2374802 by Nicholas Davies in Main branch]
2014-12-03 10:21:53 -05:00
Chris Wood
4f7a982034 Integrate - UE4-Fortnite => UE4
CL 2373574 - Fortnite Chat/Friends: added scrollbar to in-game chat, add friend box auto-closes when it loses focus, made Online Status button narrower, fixed add friend button size to match status, fixed a few button images, changed "reject" text to "ignore" in friends list. Various other minor tweaks.

[CL 2373633 by Chris Wood in Main branch]
2014-12-02 07:42:26 -05:00
Nicholas Davies
265f54d827 #FriendsAndChat - Updates to message storage, style updates, and removing Network message type
#jira n/a
#codereview Sam.Zamani

[CL 2372394 by Nicholas Davies in Main branch]
2014-12-01 08:46:12 -05:00
Nicholas Davies
be9f1fbd93 #FriendsAndChat - Integrate changes from FortniteDev
#codereview Sam.Zamani

[CL 2371775 by Nicholas Davies in Main branch]
2014-11-28 03:31:38 -05:00
Nicholas Davies
9179d96654 #FriendsAndChat - Allow friends to join Fortnite from an invite from the launcher.
#jira OPP-1643 Social: Player can not join another player from the portal friends list.
#jira OPP-1697 Disable join button if no access to fornite or not installed
#jira OPP-1696 Pass -invitesession=<session id> -invitefrom=<friend id> when launching fortnite
#jira OPP-1629 SOCIAL: Users are not immediately being sorted by online/offline status

[CL 2371452 by Nicholas Davies in Main branch]
2014-11-27 06:36:11 -05:00
Nicholas Davies
fc373287d7 #FriendsAndChat - Update chat view model to be per widget. Should be able to fix bugs more easily with this change
#jira n/a
#codereview Sam.Zamani
#codereview Chris.Wood

[CL 2370620 by Nicholas Davies in Main branch]
2014-11-26 04:56:03 -05:00
Nicholas Davies
cb74fdbfaa #Friends UI - Merging updates from Fortnite branch.
#codereview: Sam.Zamani

[CL 2366147 by Nicholas Davies in Main branch]
2014-11-20 04:05:40 -05:00
Nicholas Davies
59203d3bd8 Merge changes from Fortnite Josh and David fixes
[CL 2364749 by Nicholas Davies in Main branch]
2014-11-19 06:13:05 -05:00
Nicholas Davies
7d0f0822c4 Merging from Fortnite to Main
[CL 2364721 by Nicholas Davies in Main branch]
2014-11-19 05:28:05 -05:00
Sam Zamani
ed1b3c6838 Back out changelist 2364076
[CL 2364196 by Sam Zamani in Main branch]
2014-11-18 18:59:38 -05:00
Sam Zamani
f7e79d8842 Merging using UE4-Fortnite-To-UE4
#friends ui
- record aggregate chat stats

OPP-1614 Chat Summary Events - Sent at closing of app

Chat Summary Events - Sent at closing of app including a start and end time of session if possible
Total number of Global tells sent
Total number of Total number of Whisper Sent
Total number of Whispers sent per person - Including name of users sent to
Total number of Party events sent

[CL 2364076 by Sam Zamani in Main branch]
2014-11-18 17:44:36 -05:00
Sam Zamani
fafd62352b Merging using UE4-Fortnite-To-UE4
#friends ui
- store global chat messages and filter later

FORT-2422 Global chat entered by others when Global Chatter is turned off is not seen when turned back on

[CL 2363632 by Sam Zamani in Main branch]
2014-11-18 13:34:36 -05:00
Nicholas Davies
ab4b6933d1 Integrate missing files from CL 2361265
[CL 2361267 by Nicholas Davies in Main branch]
2014-11-15 11:15:13 -05:00
Nicholas Davies
8245794c6b Merging from Fortnite
[CL 2360277 by Nicholas Davies in Main branch]
2014-11-14 12:53:40 -05:00
Nicholas Davies
0e59b28b06 Merging from Fortnite
[CL 2359911 by Nicholas Davies in Main branch]
2014-11-14 08:05:34 -05:00
Sam Zamani
e7fe88e72f Merging using UE4-Fortnite-To-UE4
#xmpp
- consistent use of UTC time for all chat messages

[CL 2359471 by Sam Zamani in Main branch]
2014-11-13 22:10:33 -05:00
Nicholas Davies
5f8d8799bb Chat updates merging from Fortnite
[CL 2358966 by Nicholas Davies in Main branch]
2014-11-13 16:15:33 -05:00
Sam Zamani
fabbf81452 Merging using UE4-Fortnite-To-UE4
- fix for crash in whisper due to no friend being selected

[CL 2356610 by Sam Zamani in Main branch]
2014-11-11 20:33:47 -05:00
Sam Zamani
5a3cb12d61 Merging using UE4-Fortnite-To-UE4
- refactor "IFriendListItems" to "IFriendItem"
- refactor "FFriendStuct" to "FFriendItem"

[CL 2355867 by Sam Zamani in Main branch]
2014-11-11 10:10:45 -05:00
Nicholas Davies
3e4402d0d6 Merging from UE4-Fortnite - update to Friends and Chat system
CL2354401 to 2355034

[CL 2355705 by Nicholas Davies in Main branch]
2014-11-11 04:54:47 -05:00