chris gagnon
165d6fd28e
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)
[CL 4930699 by chris gagnon in Dev-Core branch]
2019-02-07 07:21:33 -05:00
Robert Manuszewski
338a61ef26
Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
...
#lockdown: Nick.Penwarden
#rb integration
#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)
[CL 4930119 by Robert Manuszewski in Dev-Core branch]
2019-02-07 07:01:03 -05:00
jack porter
2d29661490
Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680
...
#lockdown: Nick.Penwarden
#rb None
#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)
[CL 4910548 by jack porter in Dev-Core branch]
2019-02-05 18:39:38 -05:00
Josh Adams
8ed2583905
- Fixed the order of UnrealPak parameters, with the parallel pak file creation (required so UnrealPak can load project-enabled plugins)
...
#rb trivial
[CL 4904442 by Josh Adams in Dev-Core branch]
2019-02-05 15:33:57 -05:00
Chris Gagnon
a48e767b94
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Joe Barnes
55cc21d08f
Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
...
#lockdown: Nick.Penwarden
#rb integration
[CL 4825156 by Joe Barnes in Main branch]
2019-01-28 17:35:18 -05:00
Peter Sauerbrei
7e64781e7d
Merging //UE4/Dev-Main/... to //UE4/Dev-Mobile/... up to 4784913
...
#rb none
[CL 4791581 by Peter Sauerbrei in Dev-Mobile branch]
2019-01-23 17:53:19 -05:00
Robert Manuszewski
206e72ac04
Merging //UE4/Dev-Main to Dev-Core (//UE4/Dev-Core)
...
#rb none
[CL 4771952 by Robert Manuszewski in Dev-Core branch]
2019-01-22 14:57:52 -05:00
Chris Gagnon
0dbe1f7fb2
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -05:00
Jamie Dale
a27aefcf57
Changed some of the localization automation to use classes with read-only members, rather than use structs
...
#jira UE-65600
#rb Francis.Hurteau
#lockdown Matt.Kuhlenschmidt
[CL 4762550 by Jamie Dale in Dev-Editor branch]
2019-01-21 12:57:05 -05:00
Jamie Dale
adc2fefb19
Added support for splitting off per-platform localization
...
This is handled by the ELocTextPlatformSplitMode enum, used by FLocTextHelper (default is ELocTextPlatformSplitMode::None to preserve old behavior), and allows you to optionally split localization data for all platforms, or for any NDA restricted platforms. Note: Any localization data that is used by multiple platforms is still considered platform agnostic, even if it appears only within platform specific files.
#jira UE-65600
#rb Francis.Hurteau
#lockdown Matt.Kuhlenschmidt
[CL 4761508 by Jamie Dale in Dev-Editor branch]
2019-01-21 11:07:47 -05:00
graeme thornton
609bc76862
When adding additional files to the UFS staging list, omit movie files on dedicated servers
...
#ROBOMERGE-SOURCE: CL 4760621 via CL 4760623 via CL 4760625
[CL 4760626 by graeme thornton in Main branch]
2019-01-21 08:44:13 -05:00
Jack Porter
068ca68f0b
Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile
...
#rb None
[CL 4749281 by Jack Porter in Dev-Mobile branch]
2019-01-17 21:54:28 -05:00
James Hopkin
a9f7efc154
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
...
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 4718806
[CL 4732416 by James Hopkin in Dev-Core branch]
2019-01-16 10:11:46 -05:00
Robert Manuszewski
cfa01c09c7
Merging //UE4/Dev-Main to Dev-Core (//UE4/Dev-Core)
...
#rb none
[CL 4731457 by Robert Manuszewski in Dev-Core branch]
2019-01-16 04:23:12 -05:00
Chris Gagnon
1dd3e0189f
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Chris Gagnon
1a3bf5caf1
Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
...
#rb none
[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Ben Marsh
a22b952aa9
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
...
#rb none
#rnx
[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00
david harvey
ce5b5b562e
modifying BuildPhysX to automatically include a 'github ignore' tag so the automated Build PhysX can check in again.
...
#rb anthony.bills
[FYI] ben.marsh
#ROBOMERGE-SOURCE: CL 4709402
[CL 4709418 by david harvey in Main branch]
2019-01-11 11:11:08 -05:00
Francis Hurteau
57c677da93
Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Marc Audy
ab108c215e
Copying to Dev-Main @ CL# 4688301
...
#rb
#rnx
[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00
Cosmin Sulea
14bd625ab2
UE-63983 - Fix and re-enable deployment server
...
#jira UE-63983
#rb Jack.Porter
[CL 4688224 by Cosmin Sulea in Dev-Mobile branch]
2019-01-08 09:35:52 -05:00
Robert Manuszewski
1b802d6357
Merging //UE4/Dev-Main @ 4678276 to Dev-Core (//UE4/Dev-Core)
...
#rb none
[CL 4678810 by Robert Manuszewski in Dev-Core branch]
2019-01-03 12:12:16 -05:00
Chris Gagnon
8fc25ea18e
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Robert Manuszewski
2752c82adc
Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
...
#rb none
[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -05:00
