Fred Kimberley
21ff67e268
Merging using UE4-Fortnite-To-UE4
...
Integration from CL 2589598.
[CL 2596395
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
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
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
Dmitry Rekman
f3d947f929
Fix clang error; unclear if properly.
...
#codereview Antony.Carter
(Merging CL 2587348 from LauncherDev to main).
[CL 2587355 by Dmitry Rekman in Main branch]
2015-06-15 10:43:39 -04:00
John Abercrombie
0bacc967eb
Merging using UE4-Fortnite-To-UE4 @ CL 2578109
...
[CL 2584863 by John Abercrombie in Main branch]
2015-06-11 16:25:03 -04:00
Sam Zamani
da111fcc2d
Merging using UE4-To-UE4-LauncherDev
...
2584013 #friends+chat, analytics
- fix for not sending private chat counts
2584233 #friends+chat
- fix for analytics events not being flushed on shutdown
- fix for analytics events not being sent due to nullptr provider
[CL 2584258 by Sam Zamani in Main branch]
2015-06-11 11:03:29 -04:00
Nicholas Davies
577a014497
[INTEGRATE] merge UE4-LauncherDev > UE4 CL 2583896
...
#jira OPP-3108 Add autocomplete and hinting
Remove set chat tips when we remove slash markup
[CL 2583904 by Nicholas Davies in Main branch]
2015-06-11 04:33:40 -04:00
Nicholas Davies
0cdf7e4512
Fix Linux Mono build - remove unused expression result
...
[CL 2583881 by Nicholas Davies in Main branch]
2015-06-11 04:02:10 -04:00
Nicholas Davies
83c572170e
#jira OPP-3557 Update Fortnite to use new Chat system
...
Fix up more style stuff in Fortnite
#codereview Antony.Carter
[CL 2582867 by Nicholas Davies in Main branch]
2015-06-10 12:10:03 -04:00
Nicholas Davies
4604c40688
Fix build warning about deprecated push menu
...
#jira n/a
#codereview Antony.Carter
[CL 2582866 by Nicholas Davies in Main branch]
2015-06-10 12:08:56 -04:00
Nicholas Davies
c22a4e6177
#jira OPP-3557 Update Fortnite to use new Chat system
...
More PIE fixes to allow us to chat from in-game. Also fixing up some warnings
#codereview Antony.Carter
[CL 2582467 by Nicholas Davies in Main branch]
2015-06-10 06:43:43 -04:00
Nicholas Davies
9a86b33ceb
[INTEGRATE] merge UE4-LauncheDev > UE4 CL 2581600
...
#jira OPP-3521 Update Social styling
Add the chat entry style
[CL 2582365 by Nicholas Davies in Main branch]
2015-06-10 03:44:49 -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
Chris Wood
8a112d6140
PushMenu() now respects QueryPopupMethod(). All menus now support reusing windows.
...
UE-14641 - Fix PushMenu() to use QueryPopupMethod()
Pretty big refactor
Adds IMenu as way to identify menus. Replaces referring to menus as SWindows.
Lots of uses of PushMenu() fixed up to match new API
#codereview Nick.Atamas
[CL 2579277 by Chris Wood in Main branch]
2015-06-05 20:19:33 -04:00
Nicholas Davies
b9cc15db1b
[INTEGRATE] merge UE4-Fortnite > UE4 updates to remove chat singleton to allow Fortnite PIE
...
cl 2567012, 2568320, 2570223, 2570640
#codereview Eric.Newman
[CL 2575470 by Nicholas Davies in Main branch]
2015-06-03 08:55:45 -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
Josh Markiewicz
d59491e91b
[AUTOMERGE]
...
#UE4 - const FUniqueNetId / FOnlinePartyId changes
--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2538253 by Josh.Markiewicz on 2015/05/05 17:39:19.
[CL 2540329 by Josh Markiewicz in Main branch]
2015-05-06 19:56:02 -04:00
Laurent Delayen
f635d52081
Fortnite Dev > Main Integration from CL #2535376
...
UE4-Fortnite-CL-2535376
CL# 2535376
MCP CL# 2532705
Linux Dedicated Server
Backend: Testing
"app" : "fortnite",
"moduleName" : "Fortnite-PublicService",
"branch" : "TRUNK",
"buildDate" : "2015-05-01T13:57:06.985Z",
"serverDate" : "2015-05-04T13:50:47.828Z",
"build" : "1306",
"cln" : "2532705",
"overridePropertiesVersion" : "unknown",
"version" : "UNKNOWN"
[CL 2539301 by Laurent Delayen in Main branch]
2015-05-06 11:05:00 -04:00
Nicholas Davies
00f6ce3921
[INTEGRATE] merge UE4-Fortnite->UE4 cl 2537674
...
Hide the Global Chat button in FriendsList while in Fortnite
[CL 2537687 by Nicholas Davies in Main branch]
2015-05-05 12:58:07 -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
Saad Nader
cde5a15b2a
Back out changelist 2530333
...
[CL 2530867 by Saad Nader in Main branch]
2015-04-29 17:31:31 -04:00
