Commit Graph

168 Commits

Author SHA1 Message Date
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
Saad Nader
6e3d1b6194 Merging using UE4-Fortnite-To-UE4
[CL 2530333 by Saad Nader in Main branch]
2015-04-29 11:20:57 -04:00
Daniel Broder
8ea8f8d7ad Merging using UE4-Fortnite-To-UE4 using 2517024
Weekly Fortnite Dev -> Main integration.

#CodeReview Paul.Moore, Bob.Tellez

[CL 2524683 by Daniel Broder in Main branch]
2015-04-24 14:07:47 -04:00
Marc Audy
22b0c8b655 Fix compile error
#lockdown Zachary.EdgertonJones

[CL 2522275 by Marc Audy in Main branch]
2015-04-22 23:24:05 -04:00
Dmitry Rekman
c54a4c8241 Fix UnrealLauncher et al shadow variables - batch 2
#codereview Marc.Audy, Carlos.Cuello, Max.Preussner, Sam.Zamani, Justin.Sargent, Alex.Fennel
#lockdown Zachary.EdgertonJones

[CL 2522119 by Dmitry Rekman in Main branch]
2015-04-22 20:31:39 -04:00
Marc Audy
de01c45007 Fix UnrealLauncher shadow variables - batch 1
#lockdown Zachary.EdgertonJones

[CL 2522071 by Marc Audy in Main branch]
2015-04-22 20:01:57 -04:00
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
Wes Hunt
3387ba7331 Social.Chat.Counts -> Social.Chat.Counts.2
* pivoted the channel info into separate events, added the channel type info.
New format:
Social.Chat.Counts.2  ; note the .2 extension since the original is already in the wild.
    Name:<String>   ; will be a user name or a channel name, depending on type.
    Type:<Private|Channel> ; private chat is with one user, channel chats have more than one,
                                             ; and is named after the channel somehow (not totally sure how).
    Count:<int> ; number of chats in that channel since the last flush.
#codereview:sam.zamani,eric.newman,darren.clary

[CL 2510808 by Wes Hunt in Main branch]
2015-04-13 17:15:48 -04:00
Nicholas Davies
5b0a75f916 #jira OPP-3150 Chat options appear broken in Main after Launcher multi window updates
Fix up network chat to not allow user name to be selected

[CL 2508007 by Nicholas Davies in Main branch]
2015-04-10 03:38: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
Bob Tellez
9593c08c36 #UE4 Adjusting code to match what is in UE4-LauncherDev. This bug was already fixed bug perforce resolves unfixed it. Redoing the fix in main to get things in sync again. Fixes UE-13314
#lockdown Zachary.EdgertonJones

[CL 2503079 by Bob Tellez in Main branch]
2015-04-06 16:59:49 -04:00
Bob Tellez
eea209e0be #UE4 Create clan and friends factory on demand for now.
#codereview Nicholas.Davies

[CL 2501281 by Bob Tellez in Main branch]
2015-04-03 13:24:07 -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
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
Nicholas Davies
8fe20ae82d #jira FORT-6095 MAIN: Social options to invite or join player are missing from Friends sub menu
Fixed up our combo buttons to use the new way of creating menu content
RB: Chris Wood

[CL 2499755 by Nicholas Davies in Main branch]
2015-04-02 08:58:51 -04:00
Nicholas Davies
b60f094b31 [INTEGRATE] merge ue4-launcheDec->ue cl cl 2495460 & Cl 2490409
Fixed #jira FORT-6495 MAIN: In-game chat is not functioning

[CL 2495486 by Nicholas Davies in Main branch]
2015-03-30 06:36:06 -04:00
Josh Markiewicz
7be7a701ce [AUTOMERGE]
#UE4 - fixed GetJoinability function to return true in non JIP cases but with status flags properly set
- added bAllowInvites to GetJoinability because bInviteOnly is not enough as boolean
- added additional check to FOnlineSessionSearchResult::IsValid

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2492936 by Josh.Markiewicz on 2015/03/26 19:52:08.

[CL 2492947 by Josh Markiewicz in Main branch]
2015-03-26 19:57:33 -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
Jaroslaw Palczynski
f23f29257b Back out changelist 2481333
Rob asked me to back out GENERATED_*_BODY -> GENERATED_BODY change for now until the "_Validate and _Implementation auto-generation" discussion is over.

#codereview Robert.Manuszewski

[CL 2481343 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:38:32 -04:00