Commit Graph

3026 Commits

Author SHA1 Message Date
matt collins
fb24ebd2e0 Adds a cvar to allow niagara VM shader compilation to skip some of HLSLCC's backend optimization passes.
Depends on 4861258!

#jira UE-69189
#rb none
[FYI] morten.vassvik

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.collins
#ROBOMERGE-SOURCE: CL 4861438 via CL 4865436 via CL 4873048
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884342 by matt collins in Dev-Networking branch]
2019-02-04 12:27:59 -05:00
ben marsh
48e5fb53be Fix non-unity compile error.
#rb none
[FYI] Anthony.Bills

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4868353 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884169 by ben marsh in Dev-Networking branch]
2019-02-04 12:23:06 -05:00
anthony bills
d2e55d1748 Fix missing module declaration in FileUtilities (4827582 introduced a link error check).
#rb david.harvey
#jira UE-69443

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4867700 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884062 by anthony bills in Dev-Networking branch]
2019-02-04 12:16:57 -05:00
anthony bills
a8756f44ff Add missing forward declaration of IFileHandle
#rb david.harvey
#jira none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4867550 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884059 by anthony bills in Dev-Networking branch]
2019-02-04 12:16:15 -05:00
ben marsh
cd246cd79b Fix uninitialized struct member causing warnings when creating DDC on Mac.
#rb none
#jira UE-69436

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4866847 in //UE4/Release-4.22/... via CL 4867291
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4883988 by ben marsh in Dev-Networking branch]
2019-02-04 12:15:17 -05:00
anthony bills
0edc5c1873 Move FZipArchiveWriter so it can be used by other modules.
(Re-add the correct files for 4859558 and fix unity build error.)

#rb david.harvey
[FYI] luke.thatcher

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4859806 via CL 4864758 via CL 4864879
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4865170 by anthony bills in Dev-Networking branch]
2019-02-01 09:29:45 -05:00
anthony bills
13cc312867 Back out changelist 4859558
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4859671 via CL 4864736 via CL 4864795
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4864829 by anthony bills in Dev-Networking branch]
2019-02-01 09:28:15 -05:00
anthony bills
05d206b80a Add a small zip file utility.
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4859558 via CL 4864727 via CL 4864783
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4864801 by anthony bills in Dev-Networking branch]
2019-02-01 09:28:09 -05:00
anthony bills
38fd676ac1 Pass down the shader format FName to IShaderFormat::NotifyShaderCooked
- Some platforms have multiple sub formats per IShaderFormat

#rb david.harvey
[FYI] luke.thatcher

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 4859289 via CL 4863633 via CL 4864171
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4864211 by anthony bills in Dev-Networking branch]
2019-02-01 07:50:22 -05:00
cosmin sulea
8f6a922aec UE-69143 - //UE4/Main 'Build DCC Win64' - Warning: CreateProc failed: The system cannot find the file specified #3
#jira UE-69143
#rb Jack.Porter
#lockdown: Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 4863021 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4863331 by cosmin sulea in Dev-Networking branch]
2019-02-01 05:55:32 -05:00
mark satterthwaite
7b17a4adaf Dupe 4858714:
Remove obsolete alternative Metal shader frequency table that was causing PVS to spit out an invalid error.

#rb none
#jira UE-69379

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4860561 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4863234 by mark satterthwaite in Dev-Networking branch]
2019-02-01 05:51:28 -05:00
ryan gerleve
f3be613426 Fix merge conflicts.
--------------------------------------
Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
Source: //UE4/Dev-Online 4860295

#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 4860323 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4860452 by ryan gerleve in Dev-Networking branch]
2019-01-31 15:36:12 -05:00
ryan gerleve
f9c954fabb Fix merge conflict
/src/ROBOMERGE_ENGINE_Dev_Networking/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection - merging //UE4/Main/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection#63


--------------------------------------
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4859489 by ryan gerleve in Dev-Networking branch]
2019-01-31 12:42:57 -05:00
cosmin sulea
868aca078e UE-69143 - //UE4/Main 'Build DCC Win64' - Warning: CreateProc failed: The system cannot find the file specified
#jira UE-69143
#rb Peter.Sauerbrei
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 4842991 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4842992 by cosmin sulea in Dev-Networking branch]
2019-01-30 10:54:42 -05:00
chris gagnon
435467dd55 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4837013 by chris gagnon in Dev-Networking branch]
2019-01-29 19:24:53 -05:00
cosmin sulea
f3f0ef22a2 Unshelved from pending changelist '4831508':
UE-69143 - //UE4/Main 'Build DCC Win64' - Warning: CreateProc failed: The system cannot find the file specified
#jira UE-69143
#rb Peter.Sauerbrei
#lockdown: Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 4833697 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4833702 by cosmin sulea in Dev-Networking branch]
2019-01-29 14:21:49 -05:00
ben marsh
3028faba18 Trigger a link error whenever a module is missing a valid IMPLEMENT_MODULE macro on Windows.
The IMPLEMENT_MODULE macro now defines an empty function called IMPLEMENT_MODULE_{ModuleName}, to which we force a reference to via the linker command line. This behavior can be disabled on a per-module basis by setting bRequiresImplementModule = false from a .build.cs file.

#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4827582 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4830013 by ben marsh in Dev-Networking branch]
2019-01-29 05:14:09 -05:00
James Hopkin
51d5e59cbe Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
#lockdown: Nick.Penwarden
#rb integration


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4828298 by James Hopkin in Dev-Networking branch]
2019-01-29 04:28:43 -05:00
ryan vance
398a8c4814 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 4824851 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4824878 by ryan vance in Dev-Networking branch]
2019-01-28 16:32:53 -05:00
ben marsh
80d8d4defd Fix mode argument to UBT when setting up AutoSDKs.
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4820577 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4820583 by ben marsh in Dev-Networking branch]
2019-01-26 14:47:31 -05:00
david hill
32ada04ee0 Merging using Dev-Anim<=>Main
//
Make our own HLOD and Skeletal reduction modules the default when user is not configured to use simplygon.
P1 4.22
#jira UE-68947
#rb self

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: david.hill
#ROBOMERGE-SOURCE: CL 4817148 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4817150 by david hill in Dev-Networking branch]
2019-01-25 18:10:04 -05:00
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
2019-01-24 20:39:08 -05:00
marc audy
ca037cc449 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4803543 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4804431 by marc audy in Dev-Networking branch]
2019-01-24 16:07:24 -05:00
matt kuhlenschmidt
bd1f13779d Fix slate viewer
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 4784056 via CL 4788832 via CL 4789078
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4803659 by matt kuhlenschmidt in Dev-Networking branch]
2019-01-24 15:48:53 -05:00
ryan gerleve
efd1e98234 Resolving conflict.
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1


--------------------------------------
Copying //UE4/Dev-Enterprise [at] cl 4784880 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788073 by ryan gerleve in Dev-Networking branch]
2019-01-23 16:05:15 -05:00