3 Commits

Author	SHA1	Message	Date
Daniel Broder	1b562a7b22	Merging using UE4-Fortnite-To-UE4 using CL 2058592. ... Removed UENUM() from EMyTownBuildingsWidgetSorting and EMyFortRatingStarSize to fix compile issues and because UENUM() was unnecessary. Also made hand-fix to UAIHotSpotRenderingComponent by removing HeaderGroup (obsolete). Did not merge TRV_HAF_Outer_012_lower_border or TRV_HAF_Outer_030 umaps due to conflicts and based on advice from Stefan. [CL 2060490 by Daniel Broder in Main branch]	2014-04-30 17:34:38 -04:00
Bob Tellez	96c40b8974	Merging UE4-Fortnite -> Main using CL#2047477 ... [CL 2049479 by Bob Tellez in Main branch]	2014-04-23 19:29:53 -04:00
Tim Sweeney	324683ce78	Engine source (Main branch up to CL 2026164)	2014-03-14 14:13:41 -04:00