John Abercrombie 4e9ac6444a Merging using UE4-Fortnite-To-UE4 @ CL 2382284 ...

[CL 2388856 by John Abercrombie in Main branch]

2014-12-15 15:29:48 -05:00

..

Android

Use a fixedfilename for OBB in APK (main.obb.png) instead of patching JavaBuildSettings.java

2014-12-10 17:23:54 -05:00

BatchFiles

Removed conditional inclusion of most platform files in UBT project so the same project can be used in Visual Studio and Mono Develop/Xamarin Studio, removed _Mono UBT and UAT projects, updated automation scripts to be compatible with Mono 3.10

2014-12-15 15:28:22 -05:00

HTML5

re-add file with correct case and relvant automation changes.

2014-11-06 15:25:26 -05:00

IOS

Update copyright notices to 2015.

2014-12-07 19:09:38 -05:00

Commit.gitdeps.xml

Merging using UE4-Fortnite-To-UE4 @ CL 2382284

2014-12-15 15:29:48 -05:00

JunkManifest.txt

[Important BUNs in here]

2014-12-11 13:44:41 -05:00

Promoted.gitdeps.xml

Rebuilt binaries for promoted changelist 2386770.

2014-12-12 12:29:23 -05:00

SourceDistribution.txt

Add UnrealVersionSelector. Allows having multiple engine installations (GitHub and binary) on the same machine, and uses a tag in the .uproject file to associate projects with the correct one. Also sets up explorer shell extensions on Windows, allowing a project to be associated with any engine version.

2014-04-23 17:52:54 -04:00