Rolando Caloca
ded2ed7259
Merging //UE4/Dev-Main@6134169 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rnx
#rb none
[CL 6139854 by Rolando Caloca in Dev-Rendering branch]
2019-04-29 11:59:36 -04:00
Juan Canada
e0b01373a8
Merging //UE4/Dev-Main[at]5937262 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rnx
#rb none
[CL 5991783 by Juan Canada in Dev-Rendering branch]
2019-04-18 14:58:19 -04:00
Rolando Caloca
ee36390eaa
Merging //UE4/Dev-Main@5808119 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rnx
#rb none
[CL 5809094 by Rolando Caloca in Dev-Rendering branch]
2019-04-09 12:22:27 -04:00
Rolando Caloca
532adaa65c
DR - Merging //UE4/Dev-Main@5531558 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
#rnx
[CL 5591014 by Rolando Caloca in Dev-Rendering branch]
2019-03-27 11:33:31 -04:00
Rolando Caloca
932a718f97
DR - Merging //UE4/Dev-Main@5196773 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
#rnx
[CL 5208164 by Rolando Caloca in Dev-Rendering branch]
2019-02-26 16:43:29 -05:00
Rolando Caloca
5154fdf98c
Merging //UE4/Dev-Main@4871865 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
#rnx
[CL 4872315 by Rolando Caloca in Dev-Rendering branch]
2019-02-01 18:09:46 -05:00
Marcus Wassmer
6995e20184
Merging //UE4/Dev-Main@4848702 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
#lockdown rolando.caloca
[CL 4854488 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:34:55 -05:00
Marcus Wassmer
68f340a63c
Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca
[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Rolando Caloca
732810a13b
DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
...
#rb none
#rnx
#lockdown Marcus.Wassmer
[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01:56 -05:00
Marcus Wassmer
fee98d3ca5
Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -05:00
Marcus Wassmer
a8d6cc952b
Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Marcus Wassmer
834e95f3d3
Merging //UE4/Dev-Main@4680011 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4680455 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:28:34 -05:00
Marcus Wassmer
cbfcbbb93b
Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
Should be just copyright updates
[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Marcus Wassmer
3c30baa4f9
Merging //UE4/Dev-Main@4661957 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
Contains temporary removal of some FGeometryCollectionSceneProxy code that is not compatible with refactor.
[CL 4664599 by Marcus Wassmer in Dev-Rendering branch]
2018-12-15 14:19:22 -05:00
Marcus Wassmer
34052d4d13
Merging //UE4/Dev-Main@4624481 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
#lockdown rolando.caloca
[CL 4626416 by Marcus Wassmer in Dev-Rendering branch]
2018-12-03 21:36:25 -05:00
Marcus Wassmer
049b4afa59
Merging //UE4/Dev-Main@4569249 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4569587 by Marcus Wassmer in Dev-Rendering branch]
2018-11-15 12:08:09 -05:00
Marcus Wassmer
c56a69a8c0
Merging //UE4/Dev-Main@4567547 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4568017 by Marcus Wassmer in Dev-Rendering branch]
2018-11-14 21:37:16 -05:00
Marcus Wassmer
437b881302
Merging //UE4/Dev-Main@4547706 to Dev-Rendering (//UE4/Dev-Rendering)
...
#rb none
[CL 4549073 by Marcus Wassmer in Dev-Rendering branch]
2018-11-07 15:32:18 -05:00
ben marsh
2423ffb06b
Create a separate installed DDC pak file for Enterprise.
...
#rb none
#jira UE-65228
#ROBOMERGE-SOURCE: CL 4476497 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4476512 by ben marsh in Staging-4.21 branch]
2018-10-16 17:26:31 -04:00
ben marsh
a1c5452e98
Fixes to plugin packaging script.
...
* Now much simpler to build a plugin against a target: UE4Game Win64 Development -Plugin=Foo.uplugin will now configure all appropriate settings and will include all files to be distributed in the manifest.
* BuildPlugin command in UAT now uses the manifest to determine which files need to be distributed.
#rb none
#jira UE-65189
#ROBOMERGE-SOURCE: CL 4462075 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4462077 by ben marsh in Staging-4.21 branch]
2018-10-12 16:52:09 -04:00
chad garyet
55945b99dc
Integrating changes from dev-build over to release-4.21
...
- Add win64 host support to DDC Group Linux
- Change project params split to remove empty entries
- Change BuildDerivedDataCache to skip building a feature pack if there are no project specific platforms for it out of the available targetplatforms
#jira UE-62311
#rb ben.marsh
#ROBOMERGE-SOURCE: CL 4431926 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4431927 by chad garyet in Staging-4.21 branch]
2018-10-05 11:15:17 -04:00
pluranium
f9186e8277
PR #5151 : Fix BuildPlugin automation command to include Shaders folder (Contributed by pluranium)
...
#rb none
#jira UE-64781
#ROBOMERGE-SOURCE: CL 4430050 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4430051 by ben marsh in Staging-4.21 branch]
2018-10-04 17:37:57 -04:00
ben marsh
49f4bbe06b
Fix UAT compile error.
...
#rb none
#jira
#ROBOMERGE-SOURCE: CL 4426571 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4426572 by ben marsh in Staging-4.21 branch]
2018-10-03 22:08:11 -04:00
Ben Marsh
3e061df43f
Undo //UE4/Release-4.21/Engine/... changelist 4420563 (due to builders not having .NET 4.6.2)
...
#rb none
#jira
#ROBOMERGE-SOURCE: CL 4421165 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4421247 by Ben Marsh in Staging-4.21 branch]
2018-10-03 11:50:00 -04:00
Ben Marsh
6cad1b2f62
Update C# projects to NET framework 4.6.2, and add manifest entry for long filename support.
...
#rb none
#jira UE-63120
#ROBOMERGE-SOURCE: CL 4420563 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4421236 by Ben Marsh in Staging-4.21 branch]
2018-10-03 11:47:13 -04:00