Commit Graph

75 Commits

Author SHA1 Message Date
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
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
steve smith
80aece8422 Ensure both x64 and Arm64 are targets for Hololens
#rb Ben.Marsh
#jira none

#ROBOMERGE-SOURCE: CL 12215063 in //UE4/Release-4.25/... via CL 12215072
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12215103 by steve smith in Main branch]
2020-03-16 14:31:46 -04:00
steve smith
0b36b5114f Undo //UE4/Release-4.25/Engine/Source/Programs/AutomationTool/Scripts/... changelist 12150027
[FYI] ben.marsh
#jira none
#rb

#ROBOMERGE-SOURCE: CL 12157362 in //UE4/Release-4.25/... via CL 12157363
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12157366 by steve smith in Main branch]
2020-03-12 19:06:52 -04:00
steve smith
82652cc59c Add x64 architecture for Hololens (fixes packaging)
#rb ben.marsh
#jira none

#ROBOMERGE-SOURCE: CL 12150027 in //UE4/Release-4.25/... via CL 12150029
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12150033 by steve smith in Main branch]
2020-03-12 13:48:43 -04:00
joe conley
235cac8c52 #jira UE-86077 Packaging plugins for HoloLens fails
#ROBOMERGE-SOURCE: CL 12094697 in //UE4/Release-4.25/... via CL 12094703
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12094709 by joe conley in Main branch]
2020-03-09 16:57:33 -04: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
ben marsh
d6efcb2ab8 Fix building of script plugins for the marketplace. Was not running the plugin with a project file that has the plugin enabled.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 11159288 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v640-11091645)

[CL 11159310 by ben marsh in Main branch]
2020-01-29 10:01:04 -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
Ryan Durand
b8631a28c3 Fixing error message for invalid platform so it actually contains the name.
#rnx
#rb none
#jira none

[CL 10804012 by Ryan Durand in Dev-Build branch]
2019-12-18 17:12:58 -05:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
2019-09-24 16:13:51 -04:00
ben marsh
6a936ba1b9 Copying //UE4/Dev-RenderPlat-Staging[at]8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 8684840 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8752957 by ben marsh in Dev-Build branch]
2019-09-17 11:58:25 -04:00
Ben Marsh
53e2288d77 Build armv7 and arm64 architectures when packaging Android plugins.
#rb none

[CL 8741522 by Ben Marsh in Dev-Build branch]
2019-09-17 08:06:34 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Ben Marsh
324e2e6c5b Remove the bBuildEditor flag passed to ModuleDescriptor.IsCompiledInConfiguration(). This is always determined from the target type now.
#rb none
#rnx

[CL 8576545 by Ben Marsh in Dev-Build branch]
2019-09-09 16:33:08 -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
Ben Marsh
3bca0a1c77 Implement the RestrictedPlatform type similarly to UnrealTargetPlatform. Platforms marked as confidential via data driven platform info are automatically registered with this list.
#rb none
#rnx

[CL 6599873 by Ben Marsh in Dev-Build branch]
2019-05-21 16:32:16 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
2019-05-03 08:03:23 -04:00
ben marsh
93c6ee9226 Prevent packaged plugins getting a hot reload suffix if the editor is running.
#rb none
#jira UE-72487

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5915309 in //UE4/Release-4.22/... via CL 5915310
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5925306 by ben marsh in Dev-Build branch]
2019-04-16 17:10:22 -04:00
ben marsh
eed7a1d9d9 Prevent packaged plugins getting a hot reload suffix if the editor is running.
#rb none
#jira UE-72487

#ROBOMERGE-SOURCE: CL 5915309 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5915310 by ben marsh in Main branch]
2019-04-16 07:42:32 -04:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00