Commit Graph

275 Commits

Author SHA1 Message Date
joakim lindqvist
89d2be1d3e Fixed VsCode error failing to find omnisharp extension.
It has been renamed by microsoft so updated to the new name.

#jira UE-90312
#rb none
#lockdown stefan.boberg

#ushell-cherrypick of 12504900 by Joakim.Lindqvist

#ROBOMERGE-SOURCE: CL 12504970 in //UE4/Release-4.25/... via CL 12504971 via CL 12504977
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504979 by joakim lindqvist in Main branch]
2020-04-01 06:36:54 -04:00
ben marsh
4a408fa900 UBT: Ignore any targets that can't be built on the current host platform when generating intellisense data for project files.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12232883 in //UE4/Release-4.25/... via CL 12232888
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12234793 by ben marsh in Main branch]
2020-03-17 15:11:31 -04:00
michael sartain
43ef13a97b Fix UnrealBuildTool unused variable warnings
#jira none
#rb Ben.Marsh
[FYI] Andrew.Grant, Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12224860 in //UE4/Release-4.25/... via CL 12224862
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224868 by michael sartain in Main branch]
2020-03-16 19:04:42 -04:00
ben marsh
ec8016f074 UBT: Add a BuildConfiguration setting for forcing UBT to be built in debug configuration (VCProjectFileGenerator/bBuildUBTInDebug).
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12169952 in //UE4/Release-4.25/... via CL 12169953
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12169955 by ben marsh in Main branch]
2020-03-13 23:17:56 -04:00
ryan vance
02bb20415f Copy up from DS to Main
#rb CopyUp



#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 12149088 via CL 12150247
#ROBOMERGE-BOT: (v659-12123632)

[CL 12150618 by ryan vance in Main branch]
2020-03-12 14:08:52 -04:00
josh adams
5482171bf2 - Removed extra Engine directory under the UE4 project above the Platforms directory (Platforms was the only folder in the Engine folder)
#jira UE-89854
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 11827890 in //UE4/Release-4.25/... via CL 11827895
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11827996 by josh adams in Main branch]
2020-03-02 11:48:53 -05:00
ben marsh
e03ee48fbd Fix exception due to directory not existing when creating VSCode project.
#rb none
#jira UE-89684
#rnx

#ROBOMERGE-SOURCE: CL 11661535 in //UE4/Release-4.25/... via CL 11661587
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11661659 by ben marsh in Main branch]
2020-02-27 11:44:52 -05:00
anthony bills
1ef400627b Add support for whitelisting additional plugins and adding additional modules to plugin extensions.
Additionally allow monolithic programs inside platform extensions to ouput to the Binaries directory in the extension.

[at]brian.white, [at]josh.adams, [at]ben.marsh
#jira UE-81798
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 11655119 in //UE4/Release-4.25/... via CL 11655234
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11655284 by anthony bills in Main branch]
2020-02-27 10:47:20 -05:00
ben marsh
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory.
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

#ROBOMERGE-SOURCE: CL 11601626 in //UE4/Release-4.25/... via CL 11601635
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11601659 by ben marsh in Main branch]
2020-02-25 09:26:12 -05:00
ben marsh
964f13a64c Fix Rider project file generation for projects with multiple targets of the same type.
#jira


#ROBOMERGE-SOURCE: CL 11586211 via CL 11586212
#ROBOMERGE-BOT: (v654-11333218)

[CL 11586213 by ben marsh in Main branch]
2020-02-23 20:02:48 -05:00
ben marsh
d58be3f852 PR #6656: Fix crash on exception from Steamworks module (Contributed by DecoyRS)
#jira


#ROBOMERGE-SOURCE: CL 11585277 via CL 11585278
#ROBOMERGE-BOT: (v654-11333218)

[CL 11585279 by ben marsh in Main branch]
2020-02-22 17:30:20 -05:00
ben marsh
7ab2ff7a72 Another fix for UE-88874 (exception generating project files from binary release).
#rb none
#jira UE-88874
#rnx

#ROBOMERGE-SOURCE: CL 11527879 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11527887 by ben marsh in 4.25-Plus branch]
2020-02-18 18:04:21 -05:00
ben marsh
a2fcf13400 Fix null reference when generating project files in binary release.
#rb none
#rnx
#jira UE-88874

#ROBOMERGE-SOURCE: CL 11461845 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461851 by ben marsh in 4.25-Plus branch]
2020-02-17 13:53:46 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00
wes hunt
3b5ce940ee Prefer 2019 when generating project files.
[FYI] ben.marsh


#ROBOMERGE-SOURCE: CL 11209774 via CL 11209775
#ROBOMERGE-BOT: (v643-11205221)

[CL 11209776 by wes hunt in Main branch]
2020-02-03 16:03:47 -05:00
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
Jack Porter
534063b6d0 When staging, set the CFBundleExecutable Info.plist entry to include Client when packaging IOS and TVOS Client C++ targets from PC. Previously it was only set for the stub and then it got overwritten by the stage version when merging plists.
#jira UE-81197
#rb Allan.Bentham
#fyi Peter.Sauerbrei

[CL 11174146 by Jack Porter in Dev-Mobile branch]
2020-01-30 05:14:28 -05:00
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
devin doucette
74fb5e239f Deterministic generation of .sln and .vcxproj files
Visual Studio solution files and project files are now generated deterministically by UnrealBuildTool to reduce solution and project reloads.

Three sources of non-determinism are addressed by this change:

1. VisualStudioSolutionFolder now uses a deterministic guid based on its folder path in the solution. Note that this relies on MasterProjectFolder.AddSubFolder avoiding sibling folders with duplicate names.
2. The Visualizers folder now uses a hard-coded Guid.
3. RulesCompiler.FindAllRulesFiles now sorts cached paths.

#rb Ben.Marsh

[CL 10983140 by devin doucette in Dev-Core branch]
2020-01-14 12:06:17 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
jack porter
0ec0f968f0 Null check fix for CL 10611459
#rb None

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 10611905 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10786333 by jack porter in Dev-Build branch]
2019-12-17 23:35:09 -05:00