izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
33,156 Commits 23 Branches 254 Tags
34c569dc00e51a3fcd4342002ffbcb26ea0af5ff
Commit Graph

224 Commits

Author SHA1 Message Date
Nicholas Davies
2dc86e293d [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes up to CL 2676817 
[CL 2677049 by Nicholas Davies in Main branch]
 2015-09-02 11:06:38 -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
Nicholas Davies
7806810889 [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes CL 2675216 
#jira FORT-12476 Icons for friends list presence

[CL 2675282 by Nicholas Davies in Main branch]
 2015-09-01 08:36:27 -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
Marc Audy
3a4114d417 Fix CIS shadowing warning 
Fix naming convention/consistency on OverrideDisplayVisibility
#codereview Bob.Tellez, Nicholas.Davies

[CL 2671381 by Marc Audy in Main branch]
 2015-08-27 15:51:12 -04:00
Marc Audy
720fce3752 Merge CIS fix from Fortnite branch 
#codereview Bob.Tellez, Nicholas.Davies

[CL 2671377 by Marc Audy in Main branch]
 2015-08-27 15:49:55 -04:00
Nicholas Davies
6d5204739c [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes CL 2669144 
[CL 2669162 by Nicholas Davies in Main branch]
 2015-08-26 09:40:36 -04:00
Nicholas Davies
0fa0f95961 Fix build issues caused by changes to F&C Navigation service 
[INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes CL 2669072
#codereview Antony.Carter

[CL 2669076 by Nicholas Davies in Main branch]
 2015-08-26 07:34:40 -04:00
Nicholas Davies
dfa2b36020 [INTEGRATE] merge UE4-Fortnite > UE4 CL up to 2667454 
[CL 2669000 by Nicholas Davies in Main branch]
 2015-08-26 05:34:10 -04:00
Antony Carter
bfabb38a75 Merging 2665897, 2667359, 2667826 
//depot/UE4-LauncherDev/...

to //depot/UE4/...

[CL 2667846 by Antony Carter in Main branch]
 2015-08-25 13:02:04 -04:00
Dmitry Rekman
a9221dfcb5 Matching LOCTEXT_NAMESPACE #def/#undef 
- Also changed some #undef's to be more uniform

[CL 2665419 by Dmitry Rekman in Main branch]
 2015-08-23 00:57:30 -04:00
Antony Carter
213eb41fbb Merging 
//depot/UE4-Orion/Engine/Source/Developer/FriendsAndChat/Public/FriendsComboStyle.h

to //depot/UE4/Engine/Source/Developer/FriendsAndChat/Public/FriendsComboStyle.h

[CL 2664196 by Antony Carter in Main branch]
 2015-08-21 06:07:34 -04:00
Nicholas Davies
3fd680c75f [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat to CL 2662447 
[CL 2662510 by Nicholas Davies in Main branch]
 2015-08-20 09:03:30 -04:00
Nicholas Davies
cb54d61176 [INTEGRATE] merge UE4-Fortnite > UE4 CL 2657605 
[CL 2657612 by Nicholas Davies in Main branch]
 2015-08-17 05:06:02 -04:00
Eric Newman
ba0f8181c7 FriendsAndChat now automatically joins the global chat configured in the game service 
Launcher will now join the Fortnite global chat channel used by DevTesting in GameDev
Updated Fortnite to match global chat changes
Reapplied fix to avoid warning spam about joining global chat when already in global chat
#jira FORT-13435
#rb nicholas.davies
#codereview nicholas.davies

[CL 2656081 by Eric Newman in Main branch]
 2015-08-14 10:22:27 -04:00
Antony Carter
25d2c58067 Merging 2654579, 2654681 
//depot/UE4-Fortnite/Engine/Source/Runtime/Online/NotForLicensees/OnlineSubsystemMcp/Private/OnlinePresenceMcp.cpp

to //depot/UE4/Engine/Source/Runtime/Online/NotForLicensees/OnlineSubsystemMcp/Private/OnlinePresenceMcp.cpp

[CL 2654844 by Antony Carter in Main branch]
 2015-08-13 12:12:19 -04:00
Nicholas Davies
7019eeeb44 [INTEGRATE] merge UE4-Fortnite > UE4 CL 2654424 
[CL 2654426 by Nicholas Davies in Main branch]
 2015-08-13 07:19:44 -04:00
Nicholas Davies
245a4d31fe [INTEGRATE] merge UE4-Fortnite > UE4 Friends and chat updates 
[CL 2652746 by Nicholas Davies in Main branch]
 2015-08-12 10:35:12 -04:00
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