Commit Graph

206 Commits

Author SHA1 Message Date
Dmitry Rekman
26749139e5 Fixes for a case-sensitive fs and shadowing warnings.
[CL 2651181 by Dmitry Rekman in Main branch]
2015-08-11 10:51:26 -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
59f6925d00 [AUTOMERGE]
#UE4 - changed how "IsFriendInSameParty" is calculated
- private parties don't have some of the information the old code depended on
#codeeview antony.carter, nicholas.davies, sam.zamani

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2648377 by Josh.Markiewicz on 2015/08/07 15:51:15.

[CL 2648402 by Josh Markiewicz in Main branch]
2015-08-07 15:58:08 -04:00
Josh Markiewicz
57eb560a93 #Integration FN->Main from CL#2644336
actual vetted build from QA

[CL 2646006 by Josh Markiewicz in Main branch]
2015-08-05 21:54:43 -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
6f3567bbca [INTEGRATE] merge UE4-LauncherDev > UE4 F&C Chages up to CL 2640132
[CL 2642336 by Nicholas Davies in Main branch]
2015-08-03 15:32:10 -04:00
Nicholas Davies
2d22b9e31d [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2636730
#jira OPP-3908 Text overlaps when copying and pastes 2+ messages in the chat window

[CL 2636733 by Nicholas Davies in Main branch]
2015-07-29 06:59:58 -04:00
Nicholas Davies
58d5f34196 [INTEGRATE] merge UE4-LauncherDev > UE4 Friends and Chat up to CL 2633708
Also, fix up Fortnite to interact with Party service, and some temp fixes to allow the Launcher to compile

[CL 2633748 by Nicholas Davies in Main branch]
2015-07-27 08:24:57 -04:00
Nicholas Davies
8e7dcdf295 #jira OPP-3557 Update Fortnite to use new Chat system
WIP update some styling, and hide chat while in-game. Also release mouse capture
#codereview Antony.Carter

[CL 2632007 by Nicholas Davies in Main branch]
2015-07-24 05:05:17 -04:00
Jamie Dale
17caf2d389 Removed SLATE_TEXT_ATTRIBUTE and SLATE_TEXT_ARGUMENT
They were deprecated in 4.8, and have been removed for the 4.10 release.

#codereview Matt.Kuhlenschmidt

[CL 2629139 by Jamie Dale in Main branch]
2015-07-22 13:08:01 -04:00
Nicholas Davies
b7d379167c [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2610916
Add messages for invalid / no friends. Fixed up some issues with the slash command button

[CL 2612260 by Nicholas Davies in Main branch]
2015-07-07 09:38:18 -04:00
Steve Robb
7661666dcb Error when a module is both a dependency and dynamically loaded.
Fixes for lots of existing modules by removing all dynamically loaded duplicates (this is probably not the correct solution, but is the safest).

#codereview robert.manuszewski

[CL 2610845 by Steve Robb in Main branch]
2015-07-06 05:46:20 -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
Nicholas Davies
114914bf60 [INTEGRATE] merge UE4-Fortnite > UE4 CL 2609048
Fix Linux build error for CL 2608984

[CL 2609063 by Nicholas Davies in Main branch]
2015-07-02 10:15:24 -04:00
Nicholas Davies
72e7700024 [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2608969
#jira OPP-10940 The Join Button is selectable when attempting to join a full party in both the Social Menu and Invite/Join Menu

[CL 2608971 by Nicholas Davies in Main branch]
2015-07-02 09:18:02 -04:00
Nicholas Davies
fa4dda9183 [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2608884
#jira OPP-10940 The Join Button is selectable when attempting to join a full party in both the Social Menu and Invite/Join Menu
Join game is greyed out when trying to join a full party

[CL 2608922 by Nicholas Davies in Main branch]
2015-07-02 08:37:12 -04:00
Alex Fennell
b54c18dd68 [AUTOMERGE]
#fortnite #online,party,mcp                  fixes for accepting party invites from the command line

--------
Integrated using branch UE4-Fortnite-To-UE4 of change#2607556 by Alex.Fennell on 2015/07/01 11:23:04.

[CL 2607609 by Alex Fennell in Main branch]
2015-07-01 12:06:42 -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
Fred Kimberley
21ff67e268 Merging using UE4-Fortnite-To-UE4
Integration from CL 2589598.

[CL 2596395 by Fred Kimberley in Main branch]
2015-06-22 20:28:51 -04:00
Marc Audy
55aa743ad5 Buildwatcher - Fix shadow variables
#codereview Justin.Sargent, John.Abercrombie

[CL 2593659 by Marc Audy in Main branch]
2015-06-19 12:01:28 -04:00
Antony Carter
ecbf64c7a2 Merging
//depot/UE4-Fortnite/Engine/Source/Developer/FriendsAndChat/Private/FriendsAndChatManager.cpp

to //depot/UE4/Engine/Source/Developer/FriendsAndChat/Private/Layers/DataAccess/FriendsAndChatManager.cpp

[CL 2593565 by Antony Carter in Main branch]
2015-06-19 10:58:10 -04:00
Antony Carter
9c4cdb17a5 Merging
//depot/UE4-Fortnite/Engine/Source/Developer/FriendsAndChat/Private/FriendsAndChatManager.cpp

to D:\\Perforce\\Epic\\UE4\\Engine\\Source\\Developer\\FriendsAndChat\\Private\\Layers\\DataAccess\\FriendsAndChatManager.cpp

[CL 2592085 by Antony Carter in Main branch]
2015-06-18 11:51: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
Nicholas Davies
26fce7ca58 [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2588345
#jira n/a
Fix Friends appearing as offline in chat window. View Model was not getting returned.

[CL 2588351 by Nicholas Davies in Main branch]
2015-06-16 05:02:36 -04:00
Antony Carter
d463111320 Merging
//depot/UE4-LauncherDev/Engine/Source/Developer/FriendsAndChat/Private/Layers/UI/SChatWindow.cpp

to D:\\Perforce\\Epic\\UE4\\Engine\\Source\\Developer\\FriendsAndChat\\Private\\Layers\\UI\\SChatWindow.cpp

[CL 2587628 by Antony Carter in Main branch]
2015-06-15 14:10:37 -04:00