Commit Graph

26 Commits

Author SHA1 Message Date
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
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
Chris Wood
3a9eb20d7b Integrate - UE4-Fortnite => UE4
CL 2369175 - Fortnite chat - fixed a few bugs
  FORT-2585 - Change the chat window background to match the mockup
  FORT-2559 - Remove the arrow on the chat window button

[CL 2369660 by Chris Wood in Main branch]
2014-11-25 05:39:51 -05:00
Nicholas Davies
0a8fc92795 #FriendsAndChat - Merging style updates from Fortnite Dev
[CL 2368726 by Nicholas Davies in Main branch]
2014-11-24 12:56:20 -05:00
Chris Wood
e728303280 Integrate - UE4-Fortnite => UE4
CL 2365267 - Fortnite friends/chat polish:
   - Tidy chat bar into one unified component instead of separate items
   - Fix chat fonts
   - Change arrow direction from down to up on channel and action buttons.
   - Make action button next to user name square.
CL 2365330 - Fortnite social/chat - fixed truncated chat channels in menu

[CL 2368448 by Chris Wood in Main branch]
2014-11-24 12:50:25 -05:00
Chris Wood
5a7d4ad8f8 Integrate - UE4-Fortnite => UE4
Originals from UE4-Fortnite-Release-5.0
CL 2359423 - Fortnite/Social: Social panel background and 'add friend' text box changes.
CL 2360109 - Fortnite/Social: Fortnite skinning chat window

[CL 2361695 by Chris Wood in Main branch]
2014-11-17 09:12:20 -05:00
Nicholas Davies
cf00bb9ecb Merging from fortnite
[CL 2356932 by Nicholas Davies in Main branch]
2014-11-12 06:43:48 -05:00
Nicholas Davies
b82e64332a Merging from fortnite
[CL 2356136 by Nicholas Davies in Main branch]
2014-11-11 15:41:34 -05:00
Nicholas Davies
225cd0ef12 Merging from UE4-Fortnite-Releases-0.5
CL 2355733

[CL 2355737 by Nicholas Davies in Main branch]
2014-11-11 06:34: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
Nicholas Davies
c023b935b3 Merging from UE4-Fortnite - update to Friends and Chat system
CL 2340958 to 2350247

[CL 2351555 by Nicholas Davies in Main branch]
2014-11-06 15:17:11 -05:00
Nicholas Davies
8ae32577e2 Integrate from UE4-Fortnite - WIP of the Friends list
CL 2324173 2324229 2326391 2326513 2328472 2328553 2328645 2329942 2330214 2331529 2331572 2333308 2334384

[CL 2334394 by Nicholas Davies in Main branch]
2014-10-20 08:14:45 -04:00
Max Preussner
121fccd2ab Code and documentation cleanup pass
- removed dummy UClasses (no longer needed)
- removed file header comments (not used)
- removed duplicated function documentation in cpp files
- documentation cleanup, punctuation, spelling etc.
- pragma once include guards (now work on all platforms)
- relative public includes (are auto-discovered by UBT)
- fixed too many/too few line breaks
- deleted empty files
- missing override
- NULL to nullptr

[CL 2305058 by Max Preussner in Main branch]
2014-09-21 20:35:48 -04:00