izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
157,157 Commits 23 Branches 254 Tags
db463b031d42484bf7ff2b057a8bf0c94dea4a9c
Commit Graph

114 Commits

Author SHA1 Message Date
Josh Adams
9917fea471 - Removed some "Win32" string references 
#rb marc.audy

[CL 15285524 by Josh Adams in ue5-main branch]
 2021-02-02 18:12:48 -04:00
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins 
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
 2021-01-27 17:40:25 -04:00
Phillip Kavan
11c00323ea Remove exposed parts of the Blueprint nativization feature (deprecated), and decouple it from the editor/cooking phase. 
#jira UE-103261
#rb Michael.Noland

[CL 14882147 by Phillip Kavan in ue5-main branch]
 2020-12-08 16:28:03 -04:00
Josh Adams
0363327c21 - Refactored UProjectPackagingSettings and UCookerSettings into DeveloperToolSettings module that can be used from the engine and other places. This removes a circular referece from Engine -> TargetPlatform -> Engine. And can potentially remove Engine -> UnrealEd "grandfathered" circular reference (or at least helps be able to get rid of it!) 
#rb brandon.schaefer

[CL 14840889 by Josh Adams in ue5-main branch]
 2020-12-02 20:43:06 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590 
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
 2020-10-09 22:42:26 -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
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
brooke hubert
48113fc77e Adding EditorFramework to build.cs files 
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
 2020-08-14 13:24:16 -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
Josh Adams
5f27a8dbcb [Upgrade Notes Critical! Licensee build scripts and DeviceProfiles may need updating] 
- Formalizing all TargetPlatforms to have a Client version, rename WindowsNoEditor to Windows, and removing DDPI specification of TargetPlatforms, and generate them programmatically
- Updated names DeviceProfiles and Build scripts, as above
- Some PlatformInfo class cleanup
- Added a TNonDesktopTargetPlatformBase class to make most TargetPlatforms simpler
- Added "No Compiled Support" to the Turnkey LaunchOn menu when the TargetPlatforms aren't compiled in (to show that even if you install an SDK, you will need to compile before you can LaunchOn)\
- Starting the transition away from PlatformInfo::FPlatformInfo to FDDPI

[CL 13966487 by Josh Adams in ue5-main branch]
 2020-07-29 16:19:10 -04:00
Josh Adams
94f4be4de1 - Renamed PlatformInfo::FPlatformInfo to PlatformInfo::FTargetPlatformInfo 
- Renamed FDataDrivenPlatformRegistry::FPlatformInfo to FDataDrivenPlatformInfo
- Moved some fields from PlatformInfo::FTargetPlatformInfo to FDataDrivenPlatformInfo, and cleaned them up in the process
- Fixed the DataDrivePlatformInfo.ini files to match the previous items
- Removed FVanillaPlatformEntry, and now just using FTargetPlatformInfo to manage flavors under a vanilla PlatformInfo (see PlatformInfo::GetVanillaPlatformInfoArray())
- Cleaned up TPerPlatformValue, as it was often misused (took a group and platform name, but we can get the group from the platform name) [AnimationSharingManager.cpp, *Engine.cpp, Runtime\Engine\*, ]
- Fixed FBlueprintNativeCodeGenPaths::GetDefaultCodeGenPaths() to use IniPlatformName instead of some hacky code [BlueprintNativeCodeGenManifest.cpp]
- Fixed various Turnkey bugs that recent testing exposed
- Enabled AUTOSDKS_ENABLED in both Mac and Linux on the Editor side (not that there are much set up to use it)
- Using Turnkey to get the SDK status instead of ValidatePlatforms (gives more detailed information - may want to go back to ValidatePlatforms so only UBT is needed, but change it to give more info)
- Moved OnDeviceDiscovered and Lost delegates from each platform's TargetPlatform class to a static in ITargetPlatform - there was no need for per-platform implementations
- Started working on allowing for SDK to be installed with editor running and not need to restart editor - Work in Progress! It is not usable yet.
#fyi jack.porter
#rb pete.sauerbrei

[CL 13816905 by Josh Adams in ue5-main branch]
 2020-07-01 17:07:12 -04:00
Phillip Kavan
61e5f11cf9 Fix incorrect platform name being used in manifest lookup for some cook targets during Blueprint nativization. 
#rb None
#jira UE-86101

[CL 11060400 by Phillip Kavan in Dev-Framework branch]
 2020-01-17 19:54:04 -05:00
Phillip Kavan
e499c66b86 Fix incorrect target platform names for some client/server configs that led to an ensure at cook time with Blueprint nativization enabled. 
#rb None
#jira UE-86101

[CL 10940643 by Phillip Kavan in Dev-Framework branch]
 2020-01-10 08:22:45 -05:00
Phillip Kavan
7e80ceffb7 Expose the new 'UncookedOnly' UBT module type to UHT in order to exclude uncooked-only script code modules from nativized Blueprint dependencies. 
#jira UE-86099
#rb Ben.Marsh, Steve.Robb

[CL 10940572 by Phillip Kavan in Dev-Framework branch]
 2020-01-10 08:04:46 -05:00
Dan Oconnor
1c8e853762 Integrate from main @ 10895611 
Merged manually:
//UE4/Dev-Framework/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_GetClassDefaults.h
//UE4/Dev-Framework/Engine/Source/Editor/BlueprintGraph/Private/K2Node_GetClassDefaults.cpp
//UE4/Dev-Framework/Engine/Source/Programs/NotForLicensees/Solaris/uLangServer/uLangServer.Target.cs
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/Private/NotForLicensees/QoSReporterConfiguration.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/Private/QoSReporter.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/Private/QoSReporterModule.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/Private/QoSReporterPrivate.h
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/Public/QoSReporter.h
//UE4/Dev-Framework/Engine/Source/Runtime/Analytics/QoSReporter/QoSReporter.Build.cs

Merged manually accepted source:
//UE4/Dev-Framework/FortniteGame/Content/Animation/Marketing/Poses/Pose_Library/HolidayPJ/HolidayPJB_Female_H.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Buildings/5x5/HLOD/Apollo_5x5_LogPyramid_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_A6_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_B1_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_E1_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_F8_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_G1_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_G7_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_G8_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_H4_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_H5_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_H6_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Apollo/Maps/Streaming/HLOD/Apollo_Terrain_Sub_H8_0_HLOD.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Items/EnvironmentalItems/PinkOatmeal/PinkOatmeal_Sepia.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Items/Weapons/WID_Harvest_Pickaxe_GalileoFerry1H.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Playlists/ContextTutorial/Mutator/ContextualTutorial_NearChestMobile.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Anchor_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Heart_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Jaws_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Keg_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Megalodon_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_Pizza_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/PickAxe_SkiBoot_Ready_Athena_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Athena/Sounds/Weapons/PickAxes/SharpDresser/PA_SharpDresser_Ready_Cue.uasset
//UE4/Dev-Framework/FortniteGame/Content/Characters/Player/Male/Medium/Bodies/M_MED_GuanYuDragon/Meshes/M_MED_Guan_Yu_Dragon_AnimBP.uasset
//UE4/Dev-Framework/FortniteGame/Content/Characters/Player/Male/Medium/Bodies/M_MED_Ornament_Soldier/Textures/T_M_MED_Ornament_Soldier_Body_N.uasset
//UE4/Dev-Framework/FortniteGame/Content/Creative/Materials/M_Creative_4Layers_Inst.uasset
//UE4/Dev-Framework/FortniteGame/Content/Heroes/Commando/CosmeticCharacterItemDefinitions/CID_Commando_034_ToyTInkerer.uasset
//UE4/Dev-Framework/FortniteGame/Content/UI/Login/SubGameSelect/SubgameSelectScreen.uasset
//UE4/Dev-Framework/FortniteGame/Documents/VO_Script/Hero VO Master.xlsx
//UE4/Dev-Framework/FortniteGame/Documents/VO_Script/STW Questline VO - MASTER SCRIPT.xlsx
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_059_wwiipilot_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.json
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_059_wwiipilot_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.png
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_081_scubamale_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.json
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_081_scubamale_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.png
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_223_orangecamo_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.json
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_223_orangecamo_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.png
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_330_astronautevilupgrade_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.json
//UE4/Dev-Framework/FortniteGame/Test/Screenshots/CosmeticTests/AthenaBackpack_bid_330_astronautevilupgrade_epic/Windows/D3D11_SM5/dc0f63bd65ec455ecd43795cf3f3059a.png
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/Materials/TileMirrorAxis.uasset
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/Materials/UVEdit.uasset
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/Materials/wall3.uasset
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/textures/carpet_ao_rough_metal.uasset
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/textures/carpetdiff.uasset
//UE4/Dev-Framework/Samples/Showcases/ArchVisRT/Content/textures/carpetnorm.uasset

Merged automatically:
//UE4/Dev-Framework/Engine/Plugins/NotForLicensees/CommonUI/Source/CommonUI/Public/CommonNumericTextBlock.h
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent.cpp
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent_Abilities.cpp
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayEffectTypes.cpp
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemComponent.h
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayAbilitySpec.h
//UE4/Dev-Framework/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayEffectTypes.h
//UE4/Dev-Framework/Engine/Source/Developer/BlueprintNativeCodeGen/Private/NativeCodeGenerationTool.cpp
//UE4/Dev-Framework/Engine/Source/Editor/Kismet/Private/BlueprintEditor.cpp
//UE4/Dev-Framework/Engine/Source/Editor/Kismet/Private/WorkflowOrientedApp/WorkflowTabManager.cpp
//UE4/Dev-Framework/Engine/Source/Editor/Kismet/Public/WorkflowOrientedApp/WorkflowTabManager.h
//UE4/Dev-Framework/Engine/Source/Editor/UnrealEd/Private/PlayLevel.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/Decorators/BTDecorator_BlueprintBase.h
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/Services/BTService_BlueprintBase.h
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/Tasks/BTTask_BlueprintBase.h
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Classes/Blueprint/AIBlueprintHelperLibrary.h
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryInstanceBlueprintWrapper.h
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Private/BehaviorTree/Decorators/BTDecorator_BlueprintBase.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Private/BehaviorTree/Services/BTService_BlueprintBase.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Private/BehaviorTree/Tasks/BTTask_BlueprintBase.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Private/Blueprint/AIBlueprintHelperLibrary.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/AIModule/Private/Navigation/PathFollowingComponent.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectMacros.h
//UE4/Dev-Framework/Engine/Source/Runtime/Engine/Private/AI/Navigation/NavigationTypes.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/Engine/Private/KismetSystemLibrary.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/NavigationSystem/Private/NavFilters/NavigationQueryFilter.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/NavMeshRenderingComponent.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp
//UE4/Dev-Framework/Engine/Source/Runtime/Slate/Private/Framework/MultiBox/MultiBoxBuilder.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteEditor/Private/FortBuildingInstructionsCommandlet.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortAIController.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortAthenaAIBotController.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortBT/FortBTDecorator_IsTakerAirborne.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortEQS/FortQueryGenerator_InfluenceMapPoints.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortEQS/FortQueryGenerator_PointsFromNavGraph.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortEnemySpawn.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortNavSystem.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortPathFollowingComponent.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/FortPathFollowingComponentBase.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/HotSpots/FortAIHotSpotSlotGenerator_OnBoundingBox.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/HotSpots/FortAIHotSpot_Building.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/MissionBots/FortBotStructureBuilder.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/NavUtils/NavGraphCellUtils.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/NavUtils/NavLinkProcessor.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/AI/Tasks/FortAITask_Move.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Abilities/FortGameplayAbility_AIPortal.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Analytics/FortAnalytics.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Analytics/FortBlueprintAnalytics.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Athena/FortAthenaZipline.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Athena/FortClientBotManagerAthena.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Athena/FortGameModeAthena.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Athena/FortPlayerControllerAthena.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/AthenaLayoutRequirementData.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingActor.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingAutoNav.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingContainer.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingCorner.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingDeco.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingFloor.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingFoundation.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingPlayerPrimitivePreview.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingProp.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingRift.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingRoof.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingSMActor.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingStairs.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingTrap.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/BuildingWall.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/DeployableBasePlot.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/DynamicBuildings/FortDynamicBuilder.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/EditMode/BuildingEditModeSupport.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/FortVolume.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Building/StructuralSupport/BuildingStructuralSupportSystem.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/ClientPilot/FortClientPilot_GameplayBase.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Components/FortControllerComponent_Interaction.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Curie/Managers/FortCurieFirePropagationManager.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Curie/Managers/FortCurieSpatialManager.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Environment/FortProceduralFoliageComponent.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/FortClientBotManager.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/FortGameMode.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/FortGameStateZone.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Input/FortPlayerInput.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/LevelRecordSpawner.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/LevelSaveRecord.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Modifiers/FortGameplayMutator_DestroyMapActors.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/NoRedist/ML/FortDetectionML_BuildingMacro.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Objectives/FortPlacementActor.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Pawns/FortAIPawn.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Pawns/FortPawn_Taker.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Player/FortPlayerController.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Replay/Automation/Pegasus/PegasusGameEventCollector.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/STW/FortConstructorBASE.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Track/FortTrack.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/UI/FortUIZone.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Weapons/FortDecoTool.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Weapons/FortProjectileDecoHelper.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Weapons/FortWeap_BuildingTool.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Private/Weapons/FortWeap_BuildingToolBase.cpp
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingActor.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingAutoNav.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingPlayerPrimitivePreview.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingProp.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingTrap.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Building/BuildingWall.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/FortAssets.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Player/FortPlayerController.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/STW/FortConstructorBASE.h
//UE4/Dev-Framework/FortniteGame/Source/FortniteGame/Public/Track/FortTrack.h

All other files merged 'safely'

#rb none

[CL 10934998 by Dan Oconnor in Dev-Framework branch]
 2020-01-09 19:00:27 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer. 
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
 2019-12-26 15:32:37 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main) 
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
 2019-12-13 11:07:03 -05:00
phillip kavan
773fe128ee Fix for build exception during nativization of Match3 sample project (regression). 
#rnx
#rb None
#jira UE-84832
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 10417788 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10419112 by phillip kavan in Main branch]
 2019-11-25 12:13:51 -05:00
Marc Audy
9ab536778a Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 10281258 
#rb
#rnx

[CL 10287351 by Marc Audy in Dev-Framework branch]
 2019-11-18 12:24:43 -05:00
phillip kavan
2e9d75b745 Exclude class assets that inherit from a native C++ class with sparse data from Blueprint nativization. It's not supported at this time. 
#rnx
#jira UE-82738
#rb Fred.Kimberley

#ROBOMERGE-SOURCE: CL 9894121 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)

[CL 9894122 by phillip kavan in Main branch]
 2019-10-30 14:19:20 -04:00
Phillip Kavan
71112bfea7 Extend the standalone BP class nativization tool to interface types. 
#rb None
#jira UE-79579

[CL 9694094 by Phillip Kavan in Dev-Framework branch]
 2019-10-18 14:06:30 -04:00
Phillip Kavan
7dff706ffd Fix accidental source/header swap in nativized builds. 
- Regression, introduced at 9216901.

#rnx
#rb Dan.OConnor
#jira UE-81017

[CL 9306450 by Phillip Kavan in Dev-Framework branch]
 2019-09-30 15:52:59 -04:00
Marc Audy
d078ac3f77 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 9298289 
#rb
#rnx

[CL 9300430 by Marc Audy in Dev-Framework branch]
 2019-09-30 11:36:53 -04:00
Dan Oconnor
860dbb3638 Refactor call to CompileBlueprint into compilation manager 
#rb Phillip.Kavan
#jira UE-47696

[CL 9216901 by Dan Oconnor in Dev-Framework branch]
 2019-09-27 13:14:31 -04: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