Commit Graph

59 Commits

Author SHA1 Message Date
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Ben Marsh
d48f3651bb Fix incorrect argument for UE5 project in Xcode project files.
#rb none
#jira UE-104928

[CL 14990888 by Ben Marsh in ue5-main branch]
2021-01-05 09:38:02 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware.
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
2020-12-20 17:32:59 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
Ben Marsh
486408b1a9 Rename UE5Editor to UnrealEditor.
#rb none
#jira UE-97600

[CL 14292067 by Ben Marsh in ue5-main branch]
2020-09-10 15:39:00 -04:00
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5.
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
2020-09-10 09:10:30 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
ben marsh
306377ee32 Fixed UBT warnings due to missing documentation comment.
#rb none
[FYI] Jack.Porter
#jira

#ROBOMERGE-SOURCE: CL 12852440 in //UE4/Release-4.25/... via CL 12852453 via CL 12852468
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12852495 by ben marsh in Main branch]
2020-04-16 08:06:27 -04:00
jack porter
f2bbf8161a Fixed a number of cases where code was assuming Client targets are always named the same as the game target with "Client" appended.
#jira UE-77351
#rb Florin.Pascu
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12841919 in //UE4/Release-4.25/... via CL 12841963 via CL 12842002
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12842018 by jack porter in Main branch]
2020-04-16 02:01:03 -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
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
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
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
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
4b06b03173 Null check fix for CL 10611459
#rb None

[CL 10611905 by Jack Porter in Main branch]
2019-12-09 11:36:18 -05:00
Jack Porter
7b7a51ec52 Clean up bBuildAsFramework to work with Kairos
#rb Peter.Sauerbrei
#jira UE-84188

[CL 10611459 by Jack Porter in Main branch]
2019-12-09 10:41:59 -05:00
anthony bills
7c07f00d2c Fix codesigning frameworks when there is a space in the path.
#rb allan.bentham
#lockdown nick.penwarden
#jira UE-84551

#ROBOMERGE-SOURCE: CL 10478612 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v605-10478255)

[CL 10478614 by anthony bills in Main branch]
2019-11-28 10:24:17 -05:00
Ben Marsh
421de9107a Fix editor-only plugins triggering recompilation of code projects.
Also rework logic for determining whether a project needs to be compiled, to more closely match equivalent code in UAT. ITargetPlatform::NeedsTempTarget() now allows querying whether a project needs a temporary target to be generated.

#rb none
#jira UE-79833

[CL 8623682 by Ben Marsh in Dev-Build branch]
2019-09-10 16:11:58 -04:00
michael trepka
6201a44210 Detect console application targets when generating Xcode project and set proper application type for them to avoid code signing and to allow launching them directly from Xcode
#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]
2019-09-06 13:38:32 -04:00
jack porter
a218bce175 Prevent iOS Xcode project generation from adding a default bundle identifier to the UE4.xcodeproj file which caused issues with Blueprint projects on Mac.
#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]
2019-08-19 10:22:42 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00