Commit Graph

38 Commits

Author SHA1 Message Date
Nicholas Davies
ba13627b01 Updating Fortnite and Portal to use the social plugin
#codereview Antony.Carter

[CL 2691682 by Nicholas Davies in Main branch]
2015-09-15 10:18:11 -04:00
Antony Carter
204e41cb6e Merging latest social fixed from Orion to Main
//depot/UE4-Orion/Engine/Source/Developer/FriendsAndChat/...

to //depot/UE4/Engine/Source/Developer/FriendsAndChat/...

[CL 2682562 by Antony Carter in Main branch]
2015-09-07 14:26:24 -04:00
Nicholas Davies
5c57c5e269 [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes up to CL 2675588
[CL 2675621 by Nicholas Davies in Main branch]
2015-09-01 12:28:00 -04:00
Bob Tellez
e9f5fa882d Dev->Main Merging CL#2668915 using UE4-Fortnite-To-UE4
[CL 2675065 by Bob Tellez in Main branch]
2015-08-31 22:22:58 -04:00
Josh Markiewicz
ef5102b2e0 #UE4 - merging all F&C features from FN into main branch
#codereview nicholas.davies

[CL 2648476 by Josh Markiewicz in Main branch]
2015-08-07 16:15:57 -04:00
Josh Markiewicz
f8d83447e1 #Integration FN->Main from CL#2642868
Engine Source changes

[CL 2645403 by Josh Markiewicz in Main branch]
2015-08-05 15:54:57 -04:00
Nicholas Davies
b2fa48d0a3 [INTEGRATE] merge UE4-LauncherDev > UE4 FriendsAndChat up to CL 2609064
Fix Linux build error for CL 2608984

[CL 2609193 by Nicholas Davies in Main branch]
2015-07-02 11:25:26 -04:00
Antony Carter
933ada3b0c Merging
//depot/UE4-LauncherDev/...

to //depot/UE4/...

[CL 2602006 by Antony Carter in Main branch]
2015-06-26 07:15:12 -04:00
Nicholas Davies
1995ebcbd3 [INTEGRATE] merge UE4-LauncherDev > UE4
Friends & Chat changes up to 2588351

[CL 2591733 by Nicholas Davies in Main branch]
2015-06-18 06:37:43 -04:00
Justin Sargent
273cde1704 Merging using UE4-To-UE4-LauncherDev
#platformnotify Josh.Adams

[CL 2581810 by Justin Sargent in Main branch]
2015-06-09 16:41:53 -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
Eric Newman
e16fbc8a13 Renaming in-game chat to "Game" to free up "Party" identifier for the new party system that persists cross-game and has its own xmpp chat channel
Merging //depot/UE4-Fortnite/... to //depot/UE4/...

[CL 2531031 by Eric Newman in Main branch]
2015-04-29 19:14:38 -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
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
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
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
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
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
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
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
f4d2b3f43d #FriendsAndChat - More style updates. Updating padding, and adding buttons
#jira n/a

[CL 2372058 by Nicholas Davies in Main branch]
2014-11-28 12:16:38 -05:00