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
22,423 Commits 23 Branches 254 Tags
bb9ed201650b1303c825750794335750464fd0ff
Commit Graph

30 Commits

Author SHA1 Message Date
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
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
Laurent Delayen
e586cd3a8f Dev to Main integration from CL #2446290 
[CL 2456855 by Laurent Delayen in Main branch]
 2015-02-23 15:58:14 -05: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
Steve Robb
0756ef15b9 Delegate comparisons deprecated, lots of other associated code deprecated, and lots of warning fixups: 
* Multicast delegate Add* calls now return FDelegateHandles, and Remove* calls are now all deprecated, except for a new Remove function which takes a FDelegateHandle.
* New FConsoleManager::RegisterConsoleVariableSink_Handle and UnregisterConsoleVariableSink_Handle functions which work in terms of FConsoleVariableSinkHandle.
* Timer calls which don't take FTimerHandles are deprecated.
* FTicker::AddTicker now returns an FDelegateHandle and is removed by an overloaded Remove function.
* DEFINE_ONLINE_DELEGATE* macros now define _Handle variants of the Add/Remove functions which return/take handles.
* Various other handle-based registration changes.
* Some unity build fixes.
* Some simplification of delegate code.
* Fixes for lots of existing code to use handle-based registration and unregistration.

#codereview robert.manuszewski

[CL 2400883 by Steve Robb in Main branch]
 2015-01-08 09:29:27 -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
Nicholas Davies
76bff792bd #FriendsAndChat - Merge from Fortnite Dev 
[CL 2388904 by Nicholas Davies in Main branch]
 2014-12-15 15:30:36 -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
3f3c00445a Fix up message caps for different message types. Fixed a party chat message display issue. Changed the list view to use chat item view models provided from the manager. Fixed an issue with non-friends selected action changes when a friend status changes 
#jira n/a

[CL 2374802 by Nicholas Davies in Main branch]
 2014-12-03 10:21:53 -05:00
Nicholas Davies
707f529c03 #FriendsAndChat - Setting the message exiry time on party messages correctly 
#jira n/a

[CL 2372397 by Nicholas Davies in Main branch]
 2014-12-01 08:46:24 -05:00
Nicholas Davies
265f54d827 #FriendsAndChat - Updates to message storage, style updates, and removing Network message type 
#jira n/a
#codereview Sam.Zamani

[CL 2372394 by Nicholas Davies in Main branch]
 2014-12-01 08:46:12 -05:00
Nicholas Davies
fc373287d7 #FriendsAndChat - Update chat view model to be per widget. Should be able to fix bugs more easily with this change 
#jira n/a
#codereview Sam.Zamani
#codereview Chris.Wood

[CL 2370620 by Nicholas Davies in Main branch]
 2014-11-26 04:56:03 -05:00
Nicholas Davies
cb74fdbfaa #Friends UI - Merging updates from Fortnite branch. 
#codereview: Sam.Zamani

[CL 2366147 by Nicholas Davies in Main branch]
 2014-11-20 04:05:40 -05:00
Nicholas Davies
7d0f0822c4 Merging from Fortnite to Main 
[CL 2364721 by Nicholas Davies in Main branch]
 2014-11-19 05:28:05 -05:00
Sam Zamani
8ef3300669 Merging using UE4-Fortnite-To-UE4 
[CL 2364186 by Sam Zamani in Main branch]
 2014-11-18 18:54:38 -05:00
Sam Zamani
86e4bc38ab Merging using UE4-Fortnite-To-UE4 
#online,chat,mcp
- incoming chat messages accessed as TSharedRef<> instead of just const refs

[CL 2363641 by Sam Zamani in Main branch]
 2014-11-18 13:35:25 -05:00
Nicholas Davies
0e59b28b06 Merging from Fortnite 
[CL 2359911 by Nicholas Davies in Main branch]
 2014-11-14 08:05:34 -05:00
Sam Zamani
b902875936 Merging using UE4-Fortnite-To-UE4 
- keep track of joined rooms and attempt to rejoin after disconnecting/reconnecting

OPP-1588 SOCIAL: User does not re-establish connection to chat window after disconnecting from network

[CL 2359489 by Sam Zamani in Main branch]
 2014-11-13 22:10:58 -05:00
Sam Zamani
e7fe88e72f Merging using UE4-Fortnite-To-UE4 
#xmpp
- consistent use of UTC time for all chat messages

[CL 2359471 by Sam Zamani in Main branch]
 2014-11-13 22:10:33 -05:00
Sam Zamani
691333c6b9 Merging using UE4-Fortnite-To-UE4 
#friends ui
- disabled public chat room enter/exit messages
- added callbacks for room enter/exit

[CL 2359447 by Sam Zamani in Main branch]
 2014-11-13 22:05:37 -05:00
Nicholas Davies
5f8d8799bb Chat updates merging from Fortnite 
[CL 2358966 by Nicholas Davies in Main branch]
 2014-11-13 16:15:33 -05:00
Sam Zamani
5a3cb12d61 Merging using UE4-Fortnite-To-UE4 
- refactor "IFriendListItems" to "IFriendItem"
- refactor "FFriendStuct" to "FFriendItem"

[CL 2355867 by Sam Zamani in Main branch]
 2014-11-11 10:10: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
Sam Zamani
f01f5e654e fix compile errors 
[CL 2353994 by Sam Zamani in Main branch]
 2014-11-08 11:17:18 -05:00
Sam Zamani
d82f66fcb2 Merging using UE4-Fortnite-To-UE4 
#friends,chat
- added global chat room functionality to chat UI
- currently auto-joins the public room "fortnite" on login and exists on logout

[CL 2353989 by Sam Zamani in Main branch]
 2014-11-08 11:02:45 -05:00