Commit Graph

49 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
c513ebd782 #FriendsAndChat - Merge from Fortnite Dev
[CL 2398594 by Nicholas Davies in Main branch]
2015-01-06 05:54:34 -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
Nicholas Davies
76bff792bd #FriendsAndChat - Merge from Fortnite Dev
[CL 2388904 by Nicholas Davies in Main branch]
2014-12-15 15:30:36 -05:00
Nicholas Davies
f9cf2c5cc3 #FriendsAndChat - Merge from Fortnite dev
[CL 2388403 by Nicholas Davies in Main branch]
2014-12-15 07:20:21 -05:00
Nick Darnell
90e793745c Slate - ESlateCheckBoxState has been renamed to ECheckBoxState.
[CL 2384008 by Nick Darnell in Main branch]
2014-12-10 14:24:09 -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
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
Nicholas Davies
b7ece7fcc9 #FriendsAndChat - Update to chat message display. Convert to Rich Text
#jira OPP-1542 SOCIAL: Chat lacks word-wrap, long words are truncated
#jira OPP-1508 SOCIAL: Long chat messages are not shown in their entirety until another chat message or action occurs in the window

[CL 2373694 by Nicholas Davies in Main branch]
2014-12-02 09:42:28 -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
Chris Wood
5ae252ba80 Integrate - UE4-Fortnite => UE4
CL 2369906 - Fortnite Chat: changed background on chat panel and channel popups to match mockup, changed size of panel, fixed popup position bug.

[CL 2371182 by Chris Wood in Main branch]
2014-11-26 17:21:00 -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