Mike Fricker 0638d8d156 Merging //UE4/Dev-Main to Dev-VREditor (from CL 3148503) ...

#rb none

[CL 3148980 by Mike Fricker in Dev-VREditor branch]

2016-10-03 13:09:01 -04:00

..

Android

Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3147796)

2016-09-30 21:21:09 -04:00

HTML5

Enable HTML5 networking plugin by default.

2015-07-15 09:24:49 -04:00

IOS

Copying //UE4/WEX-Staging to Dev-Main (//UE4/Dev-Main)

2016-09-16 17:07:30 -04:00

Linux

Copying //UE4/Dev-Platform to //UE4/Main

2015-12-10 16:56:55 -05:00

Localization

Merging \\UE4\Portal-Staging to \\UE4\Main

2016-06-29 18:00:01 -04:00

Mac

Copying //UE4/Dev-Editor to //UE4/Dev-Main (Source: //UE4/Dev-Editor @ 3082391)

2016-08-09 11:28:56 -04:00

Windows

Copying //UE4/Dev-Framework to //UE4/Dev-Main (Source: //UE4/Dev-Framework @ 3136612)

2016-09-22 15:33:34 -04:00

Base.ini

- Adding some text to Base.ini so that it doesn't cause problems by being empty and then getting skipped, etc. [user reported]

2015-05-04 19:29:18 -04:00

BaseCompat.ini

…

BaseDeviceProfiles.ini

Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3147796)

2016-09-30 21:21:09 -04:00

BaseEditor.ini

Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3147796)

2016-09-30 21:21:09 -04:00

BaseEditorKeyBindings.ini

…

BaseEditorLayout.ini

…

BaseEditorPerProjectUserSettings.ini

Merging //UE4/Dev-Main to Dev-VREditor (from CL 3148503)

2016-10-03 13:09:01 -04:00

BaseEditorSettings.ini

Point Persona tutorial to correct asset to fix cooking warning

2015-09-03 17:31:50 -04:00

BaseEngine.ini

Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3147796)

2016-09-30 21:21:09 -04:00

BaseGame.ini

Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3147796)

2016-09-30 21:21:09 -04:00

BaseHardware.ini

Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3106465)

2016-09-01 21:20:38 -04:00

BaseInput.ini

Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3064255)

2016-07-29 17:10:25 -04:00

BaseLightmass.ini

Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main)

2015-11-10 17:11:09 -05:00

BaseScalability.ini

Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3106465)

2016-09-01 21:20:38 -04:00

ConsoleVariables.ini

Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3028916)

2016-06-27 13:42:20 -04:00