Commit Graph

8344 Commits

Author SHA1 Message Date
jonas meyer
735bec3c8b Fix nans on vulkan.
hlslcc was incorrectly converting conditionals to mix. When one of the operand is a nan, this conversion is incorrect, as the nan will propagate, and thus we get weird bugs where the nans stick around.
#jira UE-71386
#rb rolando.caloca emil.persson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 5380320 in //UE4/Release-4.22/... via CL 5380325
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5415476 by jonas meyer in Dev-Networking branch]
2019-03-15 11:59:34 -04:00
michael kirzinger
9092eb7b80 Rebuild libvivoxclientapi.a with debug symbols
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 5371417 via CL 5371421 via CL 5371422 via CL 5371424 via CL 5375578 via CL 5378458
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406549 by michael kirzinger in Dev-Networking branch]
2019-03-14 19:49:22 -04:00
nick shin
1d8d86b370 HTML5 - downgrading emscripten back to 1.38.20
- removing emscripten 1.38.24

#jira UE-69753  Multithreaded HTML5 loads into a black screen
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 5371589 in //UE4/Release-4.22/... via CL 5371590
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406202 by nick shin in Dev-Networking branch]
2019-03-14 19:37:07 -04:00
joe conley
1eaad893b5 #jira UE-71390 - Binary Editor fails to start with Windows Mixed Reality enabled on win10 version < 1803
Converted Windows Mixed Reality Interop Library from a Statically Linked .lib to a dynamically loaded .dll, and fails gracefully if MixedRealityInterop fails to load because the necessary Windows-side .dlls don't exist.

#rb Ryan.Vance, Jules.Blok, Ben.Marsh, Jeff.Fisher, Keli.Hlodversson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 5371399 in //UE4/Release-4.22/... via CL 5371404
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406200 by joe conley in Dev-Networking branch]
2019-03-14 19:36:12 -04:00
patrick boutot
253a726ab6 Add callback when the panel is constructed.
VirtualCamera adds the camera only if the take panel is constructed.
#jira UE69477
#rb simon.therriault, max.chen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: patrick.boutot
#ROBOMERGE-SOURCE: CL 5361170 in //UE4/Release-4.22/... via CL 5368483
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5405859 by patrick boutot in Dev-Networking branch]
2019-03-14 19:25:43 -04:00
cosmin sulea
4ee46d5350 Merge conflict from Release-4.22 to UE4/main
#jira UE-70734
#rb Jack.Porter
#lockdown nick.penwarden

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

[CL 5405843 by cosmin sulea in Dev-Networking branch]
2019-03-14 19:25:06 -04:00
ben marsh
d61a5bb8a8 LiveCoding: Wait for other processes to finish when triggering a compile. Allows live coding to work with multiple editors open.
#rb none
#jira UE-71287

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

[CL 5405521 by ben marsh in Dev-Networking branch]
2019-03-14 19:06:24 -04:00
ben marsh
93f5869fb2 LiveCoding: Updating console app with fixes for warnings.
#rb none
#jira UE-71257

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

[CL 5404856 by ben marsh in Dev-Networking branch]
2019-03-14 18:59:34 -04:00
peter sauerbrei
fe5353ea30 addition of bit code to PLCrashReporter
#jira UE-71090
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 5352056 in //UE4/Release-4.22/... via CL 5364881
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5404843 by peter sauerbrei in Dev-Networking branch]
2019-03-14 18:59:13 -04:00
ben marsh
358292ca2a Change NatvisHelpers to use C7 debug info, so we don't require a separate PDB.
#rb none
#jira UE-71257

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

[CL 5404824 by ben marsh in Dev-Networking branch]
2019-03-14 18:58:33 -04:00
ben marsh
2ae56f29ce Fix scraping of include paths from compiler if a non-english language pack is enabled. Take the system locale, user locale and VSLANG environment variable, and check for localized versions of the "Note: Including file" message.
#rb none
#jira UE-71191

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

[CL 5404816 by ben marsh in Dev-Networking branch]
2019-03-14 18:57:48 -04:00
bart hawthorne
dc20913219 Fix issue with opening large profiles in the network profiler - we were hitting the array size limit.
[FYI] ryan.gerleve, brian.bekich, jon.nabozny

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: bart.hawthorne
#ROBOMERGE-SOURCE: CL 5353201 via CL 5355162 via CL 5355268
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5403538 by bart hawthorne in Dev-Networking branch]
2019-03-14 17:53:59 -04:00
eric ketchum
07a826fe18 Added Name for Static Bool Parameter and Group to help identify it when Derive HDR from LDR is used in a Material which has Material Instances
#rb: None

#tests: PIE

[CODEREVIEW] Tim.Elek, Scott.Kennedy

#jira: None


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: eric.ketchum
#ROBOMERGE-SOURCE: CL 5349317 via CL 5349321 via CL 5349657 via CL 5349717
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5402918 by eric ketchum in Dev-Networking branch]
2019-03-14 17:39:16 -04:00
ryan gerleve
52fb6a4595 Network profiler now correctly reports the size of RPCs with parameters larger than 8KB.
Make network profiler version history explicit.


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.gerleve
#ROBOMERGE-SOURCE: CL 5345092 via CL 5345094 via CL 5345096 via CL 5346955 via CL 5346957
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5402581 by ryan gerleve in Dev-Networking branch]
2019-03-14 17:27:28 -04:00
michael galetzka
9c22582b62 Added new collision module and updated content examples.
#jira UE-69803
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.galetzka
#ROBOMERGE-SOURCE: CL 5343049 in //UE4/Release-4.22/... via CL 5343055
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401594 by michael galetzka in Dev-Networking branch]
2019-03-14 17:06:56 -04:00
matt kuhlenschmidt
7da989af1e Fixed SM4 preview icon
#jira UE-69825
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 5341088 in //UE4/Release-4.22/... via CL 5341089
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401385 by matt kuhlenschmidt in Dev-Networking branch]
2019-03-14 17:01:52 -04:00
ben marsh
05f1a0b11a LiveCoding: Restore the console if it's minimized when a compile started.
#rb none
#jira UE-71159

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

[CL 5401316 by ben marsh in Dev-Networking branch]
2019-03-14 16:59:35 -04:00
ben marsh
37468fe6fb Better handling of window focus when compiling for live code.
* Console window is made visible and brought to the front when a compile is triggered.
* Patched application window is brought to the front once patching is complete.

#rb none
#jira UE-71128

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

[CL 5401218 by ben marsh in Dev-Networking branch]
2019-03-14 16:57:01 -04:00
ben marsh
efdd999759 LiveCoding: Fix "Show Console" button not making the window visible if the window has been closed.
#rb none
#jira UE-71076

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

[CL 5401212 by ben marsh in Dev-Networking branch]
2019-03-14 16:56:51 -04:00
michael kirzinger
60826cae53 Readd Vivox plugin and libs that were removed in CL-5317515
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 5336986 in //UE4/Release-4.22/... via CL 5337934
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5400501 by michael kirzinger in Dev-Networking branch]
2019-03-14 16:37:01 -04:00
marcus wassmer
db87425ef0 Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none

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

[CL 5376632 by marcus wassmer in Dev-Networking branch]
2019-03-12 21:25:54 -04:00
ryan vance
a9c4736dd5 #jira UE-70994
#rb none
Updating the Oculus plugin binaries to fix a known memory corruption issue.

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 5319031 in //UE4/Release-4.22/... via CL 5337041
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376494 by ryan vance in Dev-Networking branch]
2019-03-12 21:23:56 -04:00
juan canada
31b2097cfb Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer

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

[CL 5376135 by juan canada in Dev-Networking branch]
2019-03-12 21:19:38 -04:00
juan canada
341a17ce77 Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/... via CL 5335728
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376119 by juan canada in Dev-Networking branch]
2019-03-12 21:19:16 -04:00
jules blok
39b1b66cc7 Support trigger axis values in the WMR plugin.
#jira UE-66751
#rb Joe.Conley

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 5309746 in //UE4/Release-4.22/... via CL 5314672
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5329617 by jules blok in Dev-Networking branch]
2019-03-06 18:35:08 -05:00