#jira UE-78994
#rb Ben.Marsh
#lockdown cristina.riveron
#ROBOMERGE-SOURCE: CL 8553337 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)
[CL 8553340 by michael trepka in Main branch]
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none
[CL 8321295 by Josh Markiewicz in Main branch]
#jira UE-77015
#rb Josh.Adams
#lockdown Cristina.Riveron
#ROBOMERGE-SOURCE: CL 8113618 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)
[CL 8113621 by jack porter in Main branch]
Resolves issue with games having a program with the same overlapping name.
#rb ben.marsh
(ushell-p4-cherrypick of 8012043 by Joakim.Lindqvist)
[CL 8034100 by Joakim Lindqvist in Dev-Build branch]
It is now Game -> Mod -> Program -> Engine -> Enterprise
This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.
#rb none
[review]-7795550 ben.marsh
(ushell-p4-cherrypick of 7839052 by Joakim.Lindqvist)
Fixed incorrect check for non enigne modules which broke in 7839052.
Also changed local function to a member to fix build issue.
#rb none
#jira UE-76985
#ROBOMERGE-SOURCE: CL 7865223 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)
[CL 7865277 by joakim lindqvist in Main branch]
Modified OpenColor header to check if GNUC is defined before using it (as it already does a few lines below). And thus removed the global invalid GNUC define which confuses VsCode.
Fixed up spaces in define that also confused VsCode.
#rb simon.therriault
[fyi] ben.marsh
#jira UE-76985
(ushell-p4-cherrypick of 7288701 by Joakim.Lindqvist)
#ROBOMERGE-SOURCE: CL 7865169 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)
[CL 7865209 by joakim lindqvist in Main branch]
It is now Game -> Mod -> Program -> Engine -> Enterprise
This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.
#rb none
#review-7795550 ben.marsh
[CL 7839052 by Joakim Lindqvist in Dev-Build branch]
#rb none
#jira UE-78293
#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)
[CL 7709084 by ben marsh in Main branch]
#rb none
#rnx
#jira
#ROBOMERGE-SOURCE: CL 7321488 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)
[CL 7321490 by ben marsh in Main branch]