Commit Graph

10136 Commits

Author SHA1 Message Date
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
jeanluc corenthin
4cb0fa0c19 Merging CL #7691520 from //UE4/Dev-Enterprise to //UE4/Release-4.23
C4D: Correctly handle transparency layer opacity value, remove transparency color multiplication with UV from material

#jira UE-78068
#rb Anousack.Kitisa

#ROBOMERGE-SOURCE: CL 7703164 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7703203 by jeanluc corenthin in Main branch]
2019-08-01 18:09:12 -04:00
jeff fisher
254088d28b UE-75160 Hololens 1 remoting does not connect
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23)
7658706 Add HL1 remoting adjacent to HL2 remoting
7662091 Move HL1 remoting binaries to Engine/Binaries/Win64 to successfully load after CL 7658706
#rb Jackson.Fields Ryan.Vance
#jira UE-75160

#ROBOMERGE-SOURCE: CL 7700306 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7700317 by jeff fisher in Main branch]
2019-08-01 17:20:34 -04:00
steve smith
530ca1bef4 Fix VR Template controller hand animation blueprint to restore animations and correct orientation.
#jira UE-77844
#rb joe.conley

#ROBOMERGE-SOURCE: CL 7700219 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7700227 by steve smith in Main branch]
2019-08-01 17:10:26 -04:00
andrew melnychuk
62b61ac0cd Emitter Scalability Module.
Added parameter to seperate execution states for min distance and max distance. This allows a different execution states if the emitter is below or above the specified ranges.


#ROBOMERGE-SOURCE: CL 7688776 via CL 7689029 via CL 7689049 via CL 7692893
#ROBOMERGE-BOT: (v384-7690951)

[CL 7692902 by andrew melnychuk in Main branch]
2019-08-01 14:20:49 -04:00
stanley hayes
1b86f4eee6 #JIRA: SOL-499 Missing Asset
#ROBOMERGE-SOURCE: CL 7679196 via CL 7683379
#ROBOMERGE-BOT: (v382-7680231)

[CL 7683539 by stanley hayes in Main branch]
2019-08-01 10:36:37 -04:00
allan bentham
fbb2dbc44b Fix material compile error on mobile feature levels when building ActionRPG.
#jira UE-77682, UE-77119
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 7681217 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v382-7680231)

[CL 7681219 by allan bentham in Main branch]
2019-08-01 07:13:43 -04:00
stanley hayes
58515d0c28 #JIRA: SOL-499
#ROBOMERGE-SOURCE: CL 7674398 via CL 7680288
#ROBOMERGE-BOT: (v382-7680231)

[CL 7680379 by stanley hayes in Main branch]
2019-08-01 06:45:42 -04:00
jeff fisher
5d5f2ceb79 Hololens building interop binaries again.
#rb build
#jira UE-78194

#ROBOMERGE-SOURCE: CL 7678466 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v381-7673386)

[CL 7678470 by jeff fisher in Main branch]
2019-07-31 19:33:33 -04:00
nick shin
57ca076623 Python MacOS - fix broken crypto lib paths
#jira UE-75402 Python Error Spam while Packaging HTML5 on Mac
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 7678422 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v381-7673386)

[CL 7678426 by nick shin in Main branch]
2019-07-31 19:19:12 -04:00
jeff fisher
6afa7d1431 HoloLens updated to 2.0.7.0 RC remoting
-bringing remoting binaries up to latest to facilitate hl1 support recovery
-Also removes win32 config, which doesn't work and isn't used.
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) cl 7514099
#rb jackson.fields
#jira UE-75160

#ROBOMERGE-OWNER: jeff.fisher
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 7676461 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v381-7673386)

[CL 7678326 by jeff fisher in Main branch]
2019-07-31 19:02:04 -04:00
wyeth johnson
b8b1865f1d Fixing templates that had an incorrect relationship between initialize particle and color scale in update scripts
#jira none

#ROBOMERGE-SOURCE: CL 7674262 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v381-7673386)

[CL 7674265 by wyeth johnson in Main branch]
2019-07-31 14:50:35 -04:00
ben woodhouse
0f76c47673 PerfReportTool 3.84. LLM improvements
- Fix an exception when a CSV has no metadata (e.g LLM)
- Improve peak summary. Add support for the <stats> element (no longer need to rely on stats being referenced in graphs)
- Add support for wildcards, e.g <stats>*</stats>
- Remove duplicate stats automatically
- Refactor peak summary to avoid separate arrays for stat attributes - everything is now wrapped up in a PeakStatInfo struct
- Modify CsvStats csv parsing to skip stats with only spaces in the name (for some reason LLM does this)
[FYI] ben.salem


#ROBOMERGE-SOURCE: CL 7669228 via CL 7673482
#ROBOMERGE-BOT: (v380-7672804)

[CL 7673532 by ben woodhouse in Main branch]
2019-07-31 13:44:37 -04:00
wyeth johnson
1207170add One more metadata fix
#ROBOMERGE-SOURCE: CL 7669163 via CL 7673362
#ROBOMERGE-BOT: (v380-7672804)

[CL 7673444 by wyeth johnson in Main branch]
2019-07-31 13:42:09 -04:00
simon therriault
ade807bff8 - Fixing empty engine version
#rb none
#jira UE-78075

#ROBOMERGE-SOURCE: CL 7672577 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7672583 by simon therriault in Main branch]
2019-07-31 12:40:17 -04:00
brandon schaefer
276f7a5e96 Replace the *.so that will actually be used for OpenVR
#jira UE-77948
#rb none

#ROBOMERGE-SOURCE: CL 7669851 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7669855 by brandon schaefer in Main branch]
2019-07-31 11:03:28 -04:00
chad garyet
25b79a4aa7 fix wrong case for UserVotes during creation
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 7669665 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7669673 by chad garyet in Main branch]
2019-07-31 10:48:08 -04:00
wyeth johnson
e35c144fb8 Collision module now defaults to one analytical plane and has improved metadata
#jira none

#ROBOMERGE-SOURCE: CL 7669145 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7669149 by wyeth johnson in Main branch]
2019-07-31 09:25:47 -04:00
nick shin
83f18fa1a4 HTML5 - add more audio data struct checks for possible stale audio device usage after deletion
- correction to -O0 build (UE-76951)

#jira UE-72164  RunTimeError: index out of bounds spam trying to launch QAGame to HTML5
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 7662777 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7662778 by nick shin in Main branch]
2019-07-30 16:15:16 -04:00
nick shin
94fbcf7c73 HTML5 - add more audio data struct checks for possible stale audio device usage after deletion
#jira UE-72164  RunTimeError: index out of bounds spam trying to launch QAGame to HTML5
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 7662765 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7662767 by nick shin in Main branch]
2019-07-30 16:13:43 -04:00
wyeth johnson
5b0dc6a864 Refactor how constraints are set up, forces accumulate, and then post solve how we handle deriving a new accurate velocity from the change in position due to constraint satisfaction.
#jira none

#ROBOMERGE-SOURCE: CL 7659924 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7659926 by wyeth johnson in Main branch]
2019-07-30 10:03:11 -04:00
nick shin
c08e5f7163 HTML5 - SDL audio - debug build crash fix
#jira UE-76951  HTML5 project does not open due to Assertion failure at open_audio_device in DebugGame
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 7658180 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7658184 by nick shin in Main branch]
2019-07-29 22:18:20 -04:00
ben woodhouse
a7db48dff2 Make CSV metadata parsing robust to values with commas, in order to prevent exceptions crashes when reading [desktophwinfo].
A nicer solution would be to strip commas at source in the CSV profiler, but that won't work with existing data

[FYI] chris.bunner


#ROBOMERGE-SOURCE: CL 7650431 via CL 7654000
#ROBOMERGE-BOT: (v372-7473910)

[CL 7654072 by ben woodhouse in Main branch]
2019-07-29 17:35:39 -04:00
jonathan lindquist
430109246c changing the category to forces
#ROBOMERGE-SOURCE: CL 7650366 via CL 7653990
#ROBOMERGE-BOT: (v372-7473910)

[CL 7654051 by jonathan lindquist in Main branch]
2019-07-29 17:35:17 -04:00
jonathan lindquist
739ad7a598 changing the category to forces
#ROBOMERGE-SOURCE: CL 7650361 via CL 7653989
#ROBOMERGE-BOT: (v372-7473910)

[CL 7654050 by jonathan lindquist in Main branch]
2019-07-29 17:35:16 -04:00