Commit Graph

552 Commits

Author SHA1 Message Date
tyler quillen
9fb5f30690 Updated BaseEngine.ini TargetSDKVersion=26 for Android
#jira UE-67863
#ue4
#android
#rb Chris.Babcock

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: tyler.quillen
#ROBOMERGE-SOURCE: CL 5369394 in //UE4/Release-4.22/... via CL 5369405
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406097 by tyler quillen in Dev-Networking branch]
2019-03-14 19:28:33 -04:00
ryan gerleve
49c748d021 Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5361784 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5404294 by ryan gerleve in Dev-Networking branch]
2019-03-14 18:40:04 -04:00
marc audy
dce7993ff5 Dynamic Multicast delegates can now specify that their storage be stored in a sparse allocation for delegates that are expected to be bound rarely. The memory usage of an unbound sparse delegate is 1 byte instead of 16 bytes (for the empty array), however, a bound sparse delegate will have access overhead to retrieve the invocation list from the sparse object annotation.
The definition of the delegate type must specify the class and property name of the delegate that will use it and the type cannot be used outside of that context or just on the stack.
UMulticastDelegateProperty is now abstract and has 2 subclasses (UMulticastDelegateInlineProperty and UMulticastDelegateSparseProperty). The SparseProperty SignatureFunction will be a USparseDelegateFunction.
The sparse delegates do not work correctly with the python bindings at this point, but this will be visited soon.
#rb Michael.Noland
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 5295832 via CL 5306530 via CL 5306657
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5322730 by marc audy in Dev-Networking branch]
2019-03-06 18:04:30 -05:00
sorin gradinaru
9a20cfe804 UE-68313 Advertising Identified (IDFA) code for iOS should be optional in the Engine
#jira UE-68313
#iOS
#4.22
#rb Jack.Porter

Adding Enable Advertising Identified (IDFA) in Settings >> iOS >> Build. Enabled by default
Fom CL5287566[at]Revision-4.22

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5287756 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5289584 by sorin gradinaru in Dev-Networking branch]
2019-03-04 16:59:54 -05:00
ben marsh
051448e81b Fix incorrect path to engine DDC when running an executable built with a unique build environment that's more than one path deep. Add an %ENGINEDIR% variable that can be expanded from config files.
#rb none
#jira UE-70837

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5271578 in //UE4/Release-4.22/... via CL 5271626
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5274512 by ben marsh in Dev-Networking branch]
2019-03-01 21:02:06 -05:00
billy mccarroll
097eccee76 Fixes to spectator JIP. Make sure spectator beacon timeout variables are initialized.
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: billy.mccarroll
#ROBOMERGE-SOURCE: CL 5062489 via CL 5062496 via CL 5062916 via CL 5062978
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5135946 by billy mccarroll in Dev-Networking branch]
2019-02-22 03:54:29 -05:00
ben zeigler
ddb31795df #jira UE-69912 Fix crashes in ToggleDebugCamera if the selected actor was destroyed/modified while active by exposing object properties to the GC
Remove old ShowSelectedLightmap debug command as it was unsafe and not publicly exposed
#rb michael.noland

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.zeigler
#ROBOMERGE-SOURCE: CL 5048006 in //UE4/Release-4.22/... via CL 5048008
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5129382 by ben zeigler in Dev-Networking branch]
2019-02-22 02:09:37 -05:00
bob tellez
b4c2ac17dc Merging CL#5013294
Support for AnimClass Property Track by exposing SetAnimClass,GetAnimClass.
Added redirects for k2_SetAnimInstanceClass (and previous SetAnimInstanceClass).

Copy from Dev-Sequencer

#jira UE-65524
#rb mike.zyracki
[FYI] juan.collado

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: Max.Chen
#ROBOMERGE-SOURCE: CL 5014755 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5086092 by bob tellez in Dev-Networking branch]
2019-02-19 20:05:32 -05:00
justin marcus
a72aa3c306 [CODEREVIEW] justin.marcus,jeff.williams
Merge conflict.
justin.marcus, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp#3
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp#4
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h#3


--------------------------------------
Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)

Get Install Bundle Manager and dependcies building in main.




#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070 via CL 4961624
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073469 by justin marcus in Dev-Networking branch]
2019-02-19 17:16:21 -05:00
marc audy
5cd2c165e0 Rename bSpawnPawn to accurate bSpawnPlayerController for UGameplayStatics::CreatePlayer.
Also clarify parameter name for UGameInstance::CreateLocalPlayer
#jira UE-69170
#rb Michael.Noland

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4921149 in //UE4/Release-4.22/... via CL 4921150
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5067185 by marc audy in Dev-Networking branch]
2019-02-19 14:55:21 -05:00
jian ru
44e7719ff4 Resolve robomerge conflicts
#jira none
#rb none
[FYI] chris.bunner, jeff.williams

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4920023 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5066653 by jian ru in Dev-Networking branch]
2019-02-19 14:46:21 -05:00
ryan gerleve
f9c954fabb Fix merge conflict
/src/ROBOMERGE_ENGINE_Dev_Networking/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection - merging //UE4/Main/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection#63


--------------------------------------
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4859489 by ryan gerleve in Dev-Networking branch]
2019-01-31 12:42:57 -05:00
James Hopkin
51d5e59cbe Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
#lockdown: Nick.Penwarden
#rb integration


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4828298 by James Hopkin in Dev-Networking branch]
2019-01-29 04:28:43 -05:00
ryan vance
398a8c4814 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 4824851 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4824878 by ryan vance in Dev-Networking branch]
2019-01-28 16:32:53 -05:00
sam zamani
9c1c3cc4fd Added "NetErrorLogInterval" config to reduce network connection failure log spam
[at]josh.markiewicz, [at]ryan.gerleve

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: sam.zamani
#ROBOMERGE-SOURCE: CL 4806517 via CL 4806787 via CL 4806834 via CL 4809381 via CL 4809616
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4810051 by sam zamani in Dev-Networking branch]
2019-01-25 05:16:42 -05:00
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
2019-01-24 20:39:08 -05:00
matt collins
2b2dd365d8 Moving heuristics to Fortnite only.
#jira UE-65764
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.collins
#ROBOMERGE-SOURCE: CL 4785067 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788126 by matt collins in Dev-Networking branch]
2019-01-23 16:06:39 -05:00
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
2019-01-23 09:49:18 -05:00
marc audy
892f022bda Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 4736279
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4736445 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736453 by marc audy in Dev-Networking branch]
2019-01-16 16:19:29 -05:00
david hamm
c75081b36f Added support for using display cutout region on Android
- added new project setting bUseDisplayCutout
- temporary restriction to HUAWEI devices for this release (remove later)

#android
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4732433 via CL 4732462 via CL 4732476 via CL 4732493 via CL 4732510
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4732567 by david hamm in Dev-Networking branch]
2019-01-16 10:14:53 -05:00
lina halper
76003579dd Copying //UE4/Dev-Anim to Main (//UE4/Main)
[FYI] Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4715449 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4715461 by lina halper in Dev-Networking branch]
2019-01-11 22:36:30 -05:00
ryan gerleve
b41214417e Resolving conflict from Dev-Enterprise.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


--------------------------------------
Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]
2019-01-11 14:26:15 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
2019-01-11 02:57:03 -05:00
chris gagnon
aad5335ff6 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4676940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4676943 by chris gagnon in Dev-Networking branch]
2019-01-02 15:37:07 -05:00
ryan gerleve
9843ebaa9f Merging conflict by hand.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1


--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4653305 by ryan gerleve in Dev-Networking branch]
2018-12-12 11:43:42 -05:00