josh adams
8ba99b94de
- Proper fix to merge conflicts
...
#jira nojira
[FYI] bob.tellez
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032626 by josh adams in Dev-VR branch]
2019-02-16 07:13:44 -05:00
ben marsh
4bab8246c2
Fix target not being rebuilt when an plugin not required for this platform is disabled. Also add log output showing why a temp target was required.
...
#rb none
#jira UE-69674
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4974444 in //UE4/Release-4.22/... via CL 4974445
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032625 by ben marsh in Dev-VR branch]
2019-02-16 07:13:43 -05:00
bob tellez
1d031bb7be
Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
...
#jira nojira
[FYI] Josh.Adams
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032623 by bob tellez in Dev-VR branch]
2019-02-16 07:13:40 -05:00
michael trepka
1626ba3306
Don't call LaunchStaticShutdownAfterError() in Mac crash handler to avoid calling malloc/free in PhysX shutdown code
...
#jira UE-69290
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4973449
2019-02-16 07:10:55 -05:00
hongyi yu
c9abb9569b
Back out all the coded added for stats memory leak investigation. It is no longer needed and is causing crashes.
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 4972821 via CL 4973093 via CL 4973159
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032469 by hongyi yu in Dev-VR branch]
2019-02-16 07:10:29 -05:00
justin marcus
15ca4602f5
Fix module name
...
#jira UE-69927
#rb trivial
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4972979 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032335 by justin marcus in Dev-VR branch]
2019-02-16 07:08:00 -05:00
rex hill
ce17d82658
Clamp FTimespan value inside the wait function of the Event class.
...
Timespans longer than 4294967295 milliseconds were wrapping around to zero.
#jira UE-69892
#rb steve.robb
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 4972932 in //UE4/Release-4.22/... via CL 4972933
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032334 by rex hill in Dev-VR branch]
2019-02-16 07:07:59 -05:00
max chen
6fbcc7f233
Sequencer: Fix for Debug exception due to TArray::Reserve(-1)
...
[FYI] chris.gagnon, matt.hoffman
#rb mike.zyracki
#jira none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4972923 in //UE4/Release-4.22/... via CL 4972924
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032333 by max chen in Dev-VR branch]
2019-02-16 07:07:58 -05:00
anousack kitisa
872a57e3fb
Fixed box mapping generation to fit in [0, 1] range (when there's no tiling).
...
#jira UE-68727
#rb JeanLuc.Corenthin
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4971413 in //UE4/Release-4.22/... via CL 4971422
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032308 by anousack kitisa in Dev-VR branch]
2019-02-16 07:07:25 -05:00
matt kuhlenschmidt
70101cde4a
Added a row type display to the data table editor similar to the parent type in the blueprint editor. Handles navigation to user defined structs and c++ structs
...
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 4969014 via CL 4969229 via CL 4970849
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032185 by matt kuhlenschmidt in Dev-VR branch]
2019-02-16 07:04:49 -05:00
justin marcus
af60cd4a3b
Update coopyright notices
...
#jira UE-69926
#rb trivial
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4970841 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032183 by justin marcus in Dev-VR branch]
2019-02-16 07:04:46 -05:00
robert manuszewski
b29fb50e1b
Enable fast path for unique name generation for all cooked builds by default
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4968092 via CL 4968185 via CL 4970817
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032162 by robert manuszewski in Dev-VR branch]
2019-02-16 07:04:14 -05:00
bob tellez
cfe5c732e0
#UE4 Fixing a bug where gameplaytags are not properly redirected when using ImportText and adding an optional delegate on GameplayTagsManager for when a GameplayTag is loaded (either by serialization or ImportText)
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4967327 via CL 4967328 via CL 4967389 via CL 4970659
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5032015 by bob tellez in Dev-VR branch]
2019-02-16 06:55:44 -05:00
jian ru
d520609cb9
Fix a render asset streaming deadlock
...
#rb none
[FYI] Marcus.Wassmer,Uriel.Doyon
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4967222 via CL 4967223 via CL 4967307
2019-02-16 06:55:38 -05:00
lauren ridge
67591f8f13
Fix for appearance of level text in viewport
...
#jira UE-69407
#rb trivial
#rnx
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4964723 via CL 4965335 via CL 4969921
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031550 by lauren ridge in Dev-VR branch]
2019-02-16 06:17:22 -05:00
marcus wassmer
59d0362707
Add CountApplicableToMin to listtextures to see how many textures would be affected by changing the minimum required streaming LODs
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4964447 via CL 4964456 via CL 4965204 via CL 4969791
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031425 by marcus wassmer in Dev-VR branch]
2019-02-16 06:12:40 -05:00
mickael gilabert
3b4167911e
Fixed another crash in FStreamingTextureManager
...
[CODEREVIEW] Vritvij.Kadam
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mickael.gilabert
#ROBOMERGE-SOURCE: CL 4963902 via CL 4963905 via CL 4964536 via CL 4969441
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031256 by mickael gilabert in Dev-VR branch]
2019-02-16 06:07:24 -05:00
rolando caloca
4f9d20114b
Prep for Vulkan define changes
...
#rb none
#rnx
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4963879 via CL 4963884 via CL 4964343 via CL 4969440
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031255 by rolando caloca in Dev-VR branch]
2019-02-16 06:07:22 -05:00
arciel rekman
75cd110161
PhysX: change v13 Linux toolchain to v12 one (for real).
...
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).
#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031241 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:55 -05:00
arciel rekman
7eea5d5946
PhysX: change v13 Linux toolchain to v12 one.
...
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).
#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031233 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:36 -05:00
louisphilippe seguin
f71b9148c7
Added an Error log when DOREPLIFETIME is not called on a replicated property inside GetLifetimeReplicatedProps
...
If you intentionally don't want to replicate this property, use the DISABLE_REPLICATED_PROPERTY to silence the Error (see cl 4962290
2019-02-16 06:02:58 -05:00
vritvij kadam
4fb24298b9
Fixed editor crash on EndPlay in FRenderAssetStreamingManager
...
#Fortnite
#rb Justin.Moe
[CODEREVIEW] David.Hamm, Mickael.Gilabert
#rnx
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: vritvij.kadam
#ROBOMERGE-SOURCE: CL 4963122 via CL 4963124 via CL 4963813 via CL 4969291
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031109 by vritvij kadam in Dev-VR branch]
2019-02-16 06:02:21 -05:00
josh adams
ba53727028
- Memory Mapped IO enabled on IOS for Audio (via ini and platform property)
...
- -nommio on the commandline will disble it for testing
#rb gil.gribb
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031108 by josh adams in Dev-VR branch]
2019-02-16 06:02:18 -05:00
brandon schaefer
3b1544e56a
Round both to ints to avoid having to do an extra resize by being +/- 1 off. Due to one ceiling and one trunking the int
...
[CODEREVIEW] Michael.Trepka, Matt.Kuhlenschmidt
[at]Michael.Trepka, [at]Matt.Kuhlenschmidt
#jira UE-69923
#rb Matt.Kuhlenschmidt
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4969188 in //UE4/Release-4.22/... via CL 4969189
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031107 by brandon schaefer in Dev-VR branch]
2019-02-16 06:02:15 -05:00
patrick enfedaque
79ea648312
#JIRA UE-69838: Add additional name check on the ComponentInstance Outer to avoid crashing. (There are no repros)
...
#rb marc.audy
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 4968306 in //UE4/Release-4.22/... via CL 4968695
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5031104 by patrick enfedaque in Dev-VR branch]
2019-02-16 06:02:10 -05:00
