Commit Graph

17 Commits

Author SHA1 Message Date
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
Eric Newman
2e0faae848 Merging social fixes from //depot/UE4-Fortnite/... to //depot/UE4/...
Changelists 2411337,2414292,2428899,2430335,2433660,2434546,2435756,2438661,2439790,2444814,2444819,2444840,2444841,2445207,2445270

[CL 2452515 by Eric Newman in Main branch]
2015-02-19 18:53:47 -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
Nicholas Davies
a230a45d76 #FriendsAndChat - Show a tooltip if Join Game is disabled
Merge change 2384800 from Fortnite Releases > Fortnite Dev > Main

[CL 2398640 by Nicholas Davies in Main branch]
2015-01-06 08:42:04 -05:00
Chris Wood
70aa49fc9c Integrate - UE4-Fortnite => UE4
CL 2381661 -  Fortnite Chat/Friends: Added minimum size and 'Add Friends' message to empty friends list panel.
CL 2388456 - Fortnite/Portal: FriendsAndChat - UI updates to match mockups. Online status button style changed. Added friend action dropdown button and inline actions to friend items. Various additional style tweaks. Adjusted portal friends window and style to work with these changes too.
CL 2388970 - Fix Mac/Linux builds of Fortnite editor

[CL 2391256 by Chris Wood in Main branch]
2014-12-17 11:22:54 -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
8f7442a63f #FriendsAndChat - Fix up Join game option
#jira OPP-1697 Disable join button if no access to fornite or not installed

[CL 2371785 by Nicholas Davies in Main branch]
2014-11-28 04:21:38 -05:00
Nicholas Davies
be9f1fbd93 #FriendsAndChat - Integrate changes from FortniteDev
#codereview Sam.Zamani

[CL 2371775 by Nicholas Davies in Main branch]
2014-11-28 03:31:38 -05:00
Nicholas Davies
9179d96654 #FriendsAndChat - Allow friends to join Fortnite from an invite from the launcher.
#jira OPP-1643 Social: Player can not join another player from the portal friends list.
#jira OPP-1697 Disable join button if no access to fornite or not installed
#jira OPP-1696 Pass -invitesession=<session id> -invitefrom=<friend id> when launching fortnite
#jira OPP-1629 SOCIAL: Users are not immediately being sorted by online/offline status

[CL 2371452 by Nicholas Davies in Main branch]
2014-11-27 06:36:11 -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
1b67c18e41 Merging using UE4-Fortnite-To-UE4
#friends ui
- refactor to treat online,away,offline as unique states

[CL 2360991 by Sam Zamani in Main branch]
2014-11-14 19:13:52 -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
Sam Zamani
d202fb8dd7 Merging using UE4-Fortnite-To-UE4
- first pass at rich presence in friends UI

[CL 2355821 by Sam Zamani in Main branch]
2014-11-11 09:46:40 -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
Nicholas Davies
c023b935b3 Merging from UE4-Fortnite - update to Friends and Chat system
CL 2340958 to 2350247

[CL 2351555 by Nicholas Davies in Main branch]
2014-11-06 15:17:11 -05:00
Ben Zeigler
02a9e1dd4e Merging Dev -> Main using UE4-Fortnite-To-UE4 from CL 2340802
Includes following engine changes:

Getting display metrics only once at construct time when using SSafeZone. GetDisplayMetrics is expensive in Windows so it is impractical to call it every frame.
- Some AI API improvements, mostly switchig pointer function parameters to references.
- minor refactor of UCrowdFollowingComponent's queryinf functions:
    - IsCrowd*Enabled functions refactored to  IsCrowd*Active
    - implemented IsCrowd*Enabled that return acrual values of relevant properties
- Added a function to CrowdManager to query for location of agents neighbouring given agent
Added support for PS4 touchpad-based cursor
You can now choose to skip synchronously scanning for asset data in object libraries and just use the data that is currently in the asset registry. The data will be refereshed automatically later once the global scan completes. The only applies to non-commandlet editor instances.
Crash fixes for trying to access NULL Metal surfaces on IOS
Slate: Cleaned up some atlas code related to padding and corrected some comments

[CL 2347323 by Ben Zeigler in Main branch]
2014-11-03 15:47:28 -05:00
Nicholas Davies
8ae32577e2 Integrate from UE4-Fortnite - WIP of the Friends list
CL 2324173 2324229 2326391 2326513 2328472 2328553 2328645 2329942 2330214 2331529 2331572 2333308 2334384

[CL 2334394 by Nicholas Davies in Main branch]
2014-10-20 08:14:45 -04:00