Commit Graph

995 Commits

Author SHA1 Message Date
Marc Audy
cf48c338c5 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6834564
#rb
#rnx
#lockdown Michael.Noland

[CL 6834940 by Marc Audy in Dev-Framework branch]
2019-06-04 09:58:36 -04:00
Marc Audy
6fb39af50b Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6662737
#rb
#rnx

[CL 6664141 by Marc Audy in Dev-Framework branch]
2019-05-29 11:33:11 -04:00
Marc Audy
a3cfddf7f6 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6547008
#rb
#rnx

[CL 6548655 by Marc Audy in Dev-Framework branch]
2019-05-17 17:18:20 -04:00
Marc Audy
35f80e9791 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6278427
#rb
#rnx

[CL 6316100 by Marc Audy in Dev-Framework branch]
2019-05-06 08:45:12 -04:00
Marc Audy
a59ec411f9 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6142244
#rb
#rnx

[CL 6173076 by Marc Audy in Dev-Framework branch]
2019-04-30 10:19:36 -04:00
Dan Oconnor
1057caa0d6 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @5937262
#rb None

[CL 5965729 by Dan Oconnor in Dev-Framework branch]
2019-04-17 22:11:57 -04:00
Dan Oconnor
75fa0c83b8 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework)
#rb none

[CL 5812824 by Dan Oconnor in Dev-Framework branch]
2019-04-09 16:29:40 -04:00
Marc Audy
cd3793f499 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5683886
#rb
#rnx

[CL 5685324 by Marc Audy in Dev-Framework branch]
2019-04-02 09:36:42 -04:00
Marc Audy
502f469036 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5503639
#rb
#rnx

[CL 5504188 by Marc Audy in Dev-Framework branch]
2019-03-22 14:59:27 -04:00
Marc Audy
82e0666ce7 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5450266
#rb
#rnx

[CL 5459329 by Marc Audy in Dev-Framework branch]
2019-03-19 16:16:11 -04:00
Marc Audy
6c6b055f0e Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5271686
#rb
#rnx

[CL 5282523 by Marc Audy in Dev-Framework branch]
2019-03-04 10:23:33 -05:00
Marc Audy
bcc53f72d7 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4898645
#rb
#rnx

[CL 4917956 by Marc Audy in Dev-Framework branch]
2019-02-05 23:17:27 -05:00
Robert Manuszewski
559a25e622 Copying //UE4/Dev-Core @ 4771952 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4772220 by Robert Manuszewski in Main branch]
2019-01-22 15:45:34 -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
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
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
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
Robert Manuszewski
1685ed0b2e Merging //UE4/Dev-Main @ 4620382 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4631078 by Robert Manuszewski in Dev-Core branch]
2018-12-04 23:30:42 -05:00
Matt Kuhlenschmidt
fcc9402ceb Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4623549 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-03 09:48:43 -05:00