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
141,585 Commits 23 Branches 254 Tags
b65e7beea4e122007d73fbefa76f4b4dcf6869ba
Commit Graph

218 Commits

Author SHA1 Message Date
robert manuszewski
b938e59c9b Reimplementing FProperty changes from //UE4/Main 
+ Reimplemented FProperty related fixed from //UE4/Main:
CL#10791312, 10804850, 10851666, 10855122, 10855198, 10942138, 11030611, 11030639, 11032261, 11061515, 11136964,11138881, 11214238, 11214865

#rb none (previously reviewed in Dev-Core)
[FYI] Chris.Bunnner, Daniel.Lamb


#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 11302985 via CL 11303011 via CL 11303019
#ROBOMERGE-BOT: (v0-11244347)

[CL 11303183 by robert manuszewski in Main branch]
 2020-02-10 08:06:56 -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
Marc Audy
9b14e17824 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 11128285 
#rb
#rnx

[CL 11130996 by Marc Audy in Dev-Framework branch]
 2020-01-28 11:29:06 -05:00
Phillip Kavan
e802b35473 Fix blind reinstancing of natively-constructed nested subobjects during class-owned subobject initialization in nativized Blueprint C++ code. 
#rb None
#jira UE-87038

[CL 11060342 by Phillip Kavan in Dev-Framework branch]
 2020-01-17 19:28:42 -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
Acren
7d66c5c613 PR #6492: Allow UCLASS metadata to specify a CustomThunkTemplates class so that CustomThunk nodes can be nativized (Contributed by Acren) 
#rb Phillip.Kavan

[CL 10911388 by Phillip Kavan in Dev-Framework branch]
 2020-01-08 17:56:25 -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
phillip kavan
81ae73d211 Fix a typo in code that's emitted for properties that reference explicitly-mapped 'noexport' struct fields in nativized Blueprint code. 
- Mirrored from //UE4/Dev-Framework (CL# 10864850).

#rb none
#jira UE-86031
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 10864873 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v610-10636431)

[CL 10864878 by phillip kavan in Main branch]
 2019-12-20 18:17:39 -05:00
Phillip Kavan
1cc07bb4bc Fix a typo in code that's emitted for properties that reference explicitly-mapped 'noexport' struct fields in nativized Blueprint code. 
#rb none
#jira UE-86031

[CL 10864850 by Phillip Kavan in Dev-Framework branch]
 2019-12-20 18:11:41 -05:00
phillip kavan
7d520ce462 Fix an invalid cast in nativized Blueprint code for converted user-defined enum fields. 
- Mirrored from //UE4/Dev-Framework (10861958).

#rb None
#jira UE-85332
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 10863152 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v610-10636431)

[CL 10863157 by phillip kavan in Main branch]
 2019-12-20 15:11:00 -05:00
Phillip Kavan
75efcb6beb Fix an invalid cast in nativized Blueprint code for converted user-defined enum fields. 
#rb None
#jira UE-85332

[CL 10861958 by Phillip Kavan in Dev-Framework branch]
 2019-12-20 14:33:31 -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
8a7336ade0 Fix a BP nativization issue in which latent node exec pins occasionally do not fire in the converted class. 
#jira UE-60482
#rb none (trivial)

#ROBOMERGE-SOURCE: CL 10118520 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10118521 by phillip kavan in Main branch]
 2019-11-12 17:00:55 -05:00
marc audy
a235e1da08 Fix spelling error and don't create a few FStrings where a const TCHAR* would suffice. 
#jira
#rnx


#ROBOMERGE-SOURCE: CL 10111690 via CL 10111694
#ROBOMERGE-BOT: (v587-10111126)

[CL 10111696 by marc audy in Main branch]
 2019-11-12 09:19:39 -05:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24 
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
 2019-10-01 20:41:42 -04:00
nicholas goldstein
b858e7c281 Fix typo in blueprint nativization with TMap entry default Value assignment. 
#jira UE-79756
#rb phillip.kavan

[CL 8498068 by nicholas goldstein in Main branch]
 2019-09-04 15:54:18 -04:00
Marc Audy
482f804969 Generate __CustomDynamicClassInitialization in the U class not the I class for nativized interfaces 
#jira UE-79508
#rb
#rnx
#fyi Phillip.Kavan

[CL 8372996 by Marc Audy in Dev-Framework branch]
 2019-08-29 12:06:57 -04:00
Marc Audy
482b5721b9 Fix nativized interfaces not compiling 
#jira UE-79508
#rb Phillip.Kavan
#rnx

[CL 8366431 by Marc Audy in Dev-Framework branch]
 2019-08-28 18:21:46 -04:00
Marc Audy
d0d9741860 Fix static analysis warning pointing out both too many parameters to a function and a crash! 
#rb
#rnx

[CL 8124393 by Marc Audy in Dev-Framework branch]
 2019-08-20 08:39:28 -04:00
Marc Audy
95a36b7df4 Allow blueprint users to override the component class of a native introduced component. 
#jira UE-26970
#rb Phillip.Kavan

[CL 8037286 by Marc Audy in Dev-Framework branch]
 2019-08-14 12:44:32 -04:00
Marc Audy
307e2e8d66 Store a function pointer on UDynamicClass to the custom class initialization (in much the same way that AddReferencedObjects pointer is stored) to ensure the class is initialized before beginning to construct the CDO rather than code embedded in the constructor 
#rb Phillip.Kavan
#rnx

[CL 8034012 by Marc Audy in Dev-Framework branch]
 2019-08-14 11:50:43 -04:00
Marc Audy
b9bed29109 Fix spelling and remove autos 
#rb
#rnx

[CL 7954361 by Marc Audy in Dev-Framework branch]
 2019-08-12 17:34:22 -04:00
Marc Audy
971962e6f4 auto removal 
#rb
#rnx

[CL 7952458 by Marc Audy in Dev-Framework branch]
 2019-08-12 16:56:08 -04:00
Marc Audy
278eda75dd Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7234503 
#rb
#rnx

[CL 7263339 by Marc Audy in Dev-Framework branch]
 2019-07-10 13:47:03 -04:00
Marc Audy
502f469036 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5503639 
#rb
#rnx

[CL 5504188 by Marc Audy in Dev-Framework branch]
 2019-03-22 14:59:27 -04:00