Commit Graph

3 Commits

Author SHA1 Message Date
Daniel Broder
9f50173ccf Merging using UE4-Fortnite-To-UE4 from CL 2236347
Unshelved this merge from Stephan and then completed the merge with additional fixes and testing.

Hand fixed some WorldExp compile issues due to changes to OnPaint() signature.

#Integration

[CL 2245992 by Daniel Broder in Main branch]
2014-08-06 16:12:41 -04:00
Ben Zeigler
a5d3e0135b #UE4 Fix crash in Friends and Chat, if a response comes back when the manager is in an unexpected state, such as when returning to main menu when a request is pending
#codereview nicholas.davies

[CL 2040214 by Ben Zeigler in Main branch]
2014-04-23 17:37:51 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00