mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
e59338fcbb052d40802ffaf991924b2aebf04341
13 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
e80ea6b959 |
Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526 [CL 16445122 by Marc Audy in ue5-release-engine-test branch] |
||
|
|
963e65a37d |
DXC shader validation error/warning fixes
- Random.ush
- VoronoiNoise3D_ALU()
- DXC was unable to determine the interation range for the first set of loops and hence could not unroll them
- explicit loop iteration counts have been added to the unroll to resolve
- while in here I noticed the unroll counts on the other loops are incorrect so I've updated them accordingly
- MeshParticleVertexFactory.ush & NiagaraMeshVertexFactory.ush
- the texture coordiate pack/pack pattern utilized here confuses DXC
- in particluar, it appears to struggle with the conditional in the loop to handle the tail interation on the odd texture coordiate count case
- it reports this as a potential out of bounds memory access
- unsure if the DXC generated code does so or just warns
- regardless, refactored this pattern where found to move the final texture coordinate in the odd count case out of the loop and drive it off a preprocessor check
#rb David.Harvey, Brian.White, Juan.Canado
#jira none
#rnx
#ushell-cherrypick of 12545038 by eric.mcdaniel
#ROBOMERGE-SOURCE: CL 12726838 in //UE4/Release-4.25Plus/... via CL 12781755
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)
[CL 12782562 by eric mcdaniel in Main branch]
|
||
|
|
360d078ca3 |
Second batch of remaining Engine copyright updates.
#rnx #rb none [CL 10871248 by Marc Audy in Main branch] |
||
|
|
7f33a7c777 |
Fixed Noise Node fails to compile with voronoi noise if Ray Tracing is Enabled
#rb none [FYI] yuriy.odonnell #jira UE-77601 #ROBOMERGE-SOURCE: CL 7709040 in //UE4/Release-4.23/... #ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028) [CL 7709041 by juan canada in Main branch] |
||
|
|
aa0d2303d6 |
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none #rnx [CL 6944849 by Rolando Caloca in Main branch] |
||
|
|
cbfcbbb93b |
Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none Should be just copyright updates [CL 4680440 by Marcus Wassmer in Dev-Rendering branch] |
||
|
|
7598af0532 |
Update copyright notices to 2019.
#rb none #lockdown Nick.Penwarden [CL 4662404 by Ben Marsh in Main branch] |
||
|
|
78781608ad |
Merging //UE4/Dev-Main@4569646 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none [CL 4570019 by Marcus Wassmer in Dev-Rendering branch] |
||
|
|
96f3d65c5e |
From Dev-Niagara..
Fixed issue where we were incorrectly returning a float instead of an int for InputDataInt. Tweaked some conversion warnings in Niagara from float to int. Updating the Nigara custom version to force shader regeneration. #rb david.hill #tests autotests passed #lockdown nick.penwarden [CL 4569641 by Shaun Kime in Main branch] |
||
|
|
13d012685f |
Merging copyright update from 4.19 branch.
#rb none #rnx #jira [CL 3818977 by Ben Marsh in Staging-4.19 branch] |
||
|
|
77adbcb22a |
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3809756)
#rb None #lockdown Nick.Penwarden ============================ MAJOR FEATURES & CHANGES ============================ Change 3629223 by Rolando.Caloca DR - Rollback //UE4/Dev-Rendering/Engine/Source/Runtime/VulkanRHI to changelist 3627847 Change 3629708 by Rolando.Caloca DR - vk - Redo some changes from DevMobile 3601439 3604186 3606672 3617383 3617474 3617483 Change 3761370 by Arne.Schober DR - Added CityHash to use with conatiners and stuff. It provides good performance and high quallity across multiple platforms. Change 3761437 by Guillaume.Abadie Optimises motion blur compute shader for consoles. Change 3761483 by Guillaume.Abadie Fixes D3D11 RHI lying to dynamic resolution heuristic with t.MaxFPS. Change 3761995 by Mark.Satterthwaite Add the Metal compiler path to the local .pch filename to avoid problems when Xcode moves. Change 3761996 by Mark.Satterthwaite Emit more details when a pixel shader is found to have no outputs at all which Metal doesn't permit. More likely this is a bug in the shader compiler not configuring the in-out mask correctly... #jira UE-52292 Change 3761999 by Mark.Satterthwaite No need to avoid tessellation for FMetalRHICommandContext::RHIEndDrawIndexedPrimitiveUP anymore - that was from back when the tessellation logic was replicated in each RHI*Draw* implementation. #jira UE-51937 Change 3762181 by Joe.Graf Changed MaxShaderJobBatchSize to 25 on Mac as it reduced shader compile time by 21% Change 3762607 by Mark.Satterthwaite Remove accidentally included changes from 3761995. Change 3762612 by Mark.Satterthwaite Enable the explicit sincos intrinsic for Metal to avoid instances of UE-52477 that can cause shaders to compile incorrectly through hlslcc. #jira UE-52477 Change 3762772 by Michael.Lentine Move RHI calls to render thread. Change 3763021 by Richard.Wallis Remove shader cache tool project and implementation. #jira UE-51613 Change 3763082 by Guillaume.Abadie More SceneTexture, SceneColor and SceneDepth automated tests Change 3763111 by Richard.Wallis Clone of CL 3763033 (Release-4.18): Fix for crash upon launching packaged game on Mac with Share Material Shader Code enabled. #jira UE-52121 Change 3763657 by Michael.Lentine Invalidate ddc for skeletal mesh render data so that the duplicated vertex render structures are properly serialized. Change 3763727 by Jian.Ru Fix Player Collision view mode. It is caused by checking an uninitialized vertex buffer so the check always fail. #jira UE-52052 Change 3763738 by Guillaume.Abadie Implements SSR input post process material location. Change 3764271 by Mark.Satterthwaite Allow ControlPointPatch lists to flow through MetalRHI as it was setup to handle this transparently - the VSHS compute shader will convert them to triangles to draw. Report the same warning as in the pipeline creation stage as this hasn't been formally validated. #jira UE-52454 Change 3764316 by Daniel.Wright Added AVolumetricLightmapDensityVolume - gives local control over Volumetric Lightmap density. Dropping the top mip outside of the play area in Monolith saves 20Mb (35Mb original). Volumetric Lightmap no longer refines around static translucent geometry - saves 5Mb in Monolith Reworked brick culling by error mechanism. Now compares error to interpolated parent lighting instead of the brick average - prevents dropping constant value bricks which are near a wall and cause leaking due to parent interpolation after being culled. Change 3764318 by Daniel.Wright Missing file Change 3764321 by Daniel.Wright Shader compiling memory optimizations * Editor memory: Sharing uniform buffer includes and GeneratedInstancedStereo.ush per FShaderType (was previously duplicated per FShader job) * SCW input size: Sharing uniform buffer includes and SharedEnvironment per batch * 7.6Gb of shader job inputs in memory -> .5Gb (13x less) when doing a full shader compile of Paragon Editor * 13.8Gb written into worker input files -> 2.9Gb (4.7x less). Global shaders are never batched when sent to SCW so unoptimized by these changes. Change 3764595 by Daniel.Wright Added VolumetricLightmapDensityVolume asset icons Change 3764701 by Michael.Lentine Add duplicated vertices merging for meshmerge. Change 3766002 by Guillaume.Abadie Fixes a crash in translucency. Change 3766007 by Guillaume.Abadie Oups.... Fixes compilation failure. Change 3766697 by Guillaume.Abadie Giant refactor of global shader interface for upcoming native support of permutation. CL generated by python script. Change 3767205 by Chris.Bunner Deferring FMaterial::RenderingThreadShaderMap update to render-thread rather than assumption commands have been flushed. #jira UE-50652 Change 3767207 by Chris.Bunner Clamp fetched texture coordinates to those available on the mesh. Change 3767209 by Chris.Bunner PR #4203: Early-outs in UMaterialInstance parameter setters (Contributed by stefanzimecki) #jira UE-52193 Change 3767772 by Mark.Satterthwaite MetalShaderFormat will no longer fallback to text shaders when you ask it to compile to bytecode but the bytecode compiler is not available (either locally or remotely) - this ensures that the DDC can't be poisoned by incorrectly configured clients. The Editor is already setup such that if the remote shader compiler is not configured & Xcode is not available locally the shader-compiler will be invoked to generate text shaders. #jira UE-52554 Change 3768604 by Guillaume.Abadie Polish up with new global shader function signature. Change 3768993 by Guillaume.Abadie Fixes r.Upscale.Panini cvars Change 3769478 by Mark.Satterthwaite Move the ue4_stdlib.metal & PCH into a temporary directory that exists for the lifetime of the SCW on the remote side as well as the local one and add this path as an include directory. #jira UE-52587 Change 3769703 by Mark.Satterthwaite For all Metal platforms >= Metal v1.2 transform mul(a,b) into fma(a,b,0) to prevent the Apple compiler reordering operations differently between the base & depth passes which results in variance in the position output. For iOS disable fast-math when the vertex-shader uses World-Position-Offset because there are additional problems on the iOS shader compiler that result in position variance even with the above fix - WPO performance will suffer but I don't have any alternatives. Remove the depth-offset hack from the depth-only vertex shader again. #jira UES-5651 Change 3769763 by Mark.Satterthwaite Handle swizzle's in the hlslcc fma identification pass so that we reduce the number of instructions and the platform compiler can't break the instructions up. Change 3769849 by Mark.Satterthwaite Fix CIS error. Change 3770517 by Richard.Wallis Fix for crash when creating a new media texture (AppleIntelHD5000GraphicsMTLDriver!SamplerStage::bindSamplerToTexture()). Missing texture resource for binding. Old InitDynamicRHI() code has been refactored out into seperate functions which leaves us on Mac with a NULL resource initially after creation which Metal doesn't like. This fix puts InitDynamicRHI down the default setup/clear path which inits default resources - I don't think we should use a global dummy in this instance as this is a render target. #jira UE-51940 Change 3770688 by Uriel.Doyon Fixed texture resolution returning 0 when running blueprint construction scripts at cook time. Change 3771115 by Mark.Satterthwaite Report errors from failed attempts to compile global shaders or we can't see why things fail on non-Windows platforms. Change 3771263 by Mark.Satterthwaite Change the way ManualVertexFetch is enabled on Metal platforms so that it is enabled when targeting Metal v1.2 and higher (macOS 10.12+/iOS 10+). This brings iOS in the Desktop Forward renderer back into line with the Mac. #jira UERNDR-300 Change |
||
|
|
691342e35a |
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3606378)
#lockdown Nick.Penwarden #rb na Change 3604978 on 2017/08/23 by Andrew.Grant Fix for OR-42722 from 4.17 branch #!tests compiled #!rb max.chen Change 3604960 on 2017/08/23 by Andrew.Grant Proper fix for OR-43001, removed hack-around. #!tests compiled #!rb max.chen Change 3604881 on 2017/08/23 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Changed LostReservation message in tests to info from warning. #!tests compiled #!rb none #!ROBOMERGE-SOURCE: CL 3604871 in //Orion/Release-42.3/... via CL 3604878 via CL 3604880 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3604566 on 2017/08/23 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Gauntlet - return -1 for a test if there's a fatal error. Removed network errors failing tests (should be down to test to determine) Made SoakTest better able to detect failed drafts and incomplete matches #!tests ran multiple soaks and SoloAllHeroes #!rb none #!ROBOMERGE-SOURCE: CL 3604560 in //Orion/Release-42.3/... via CL 3604563 via CL 3604565 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3604181 on 2017/08/23 by David.Ratti Set ULandscapeHeightfieldCollisionComponent to be NetAddressable so that it can be replicated as a movement base without error. OR-42615 #!rb none #!tests pie Change 3603647 on 2017/08/22 by Laurent.Delayen AnimProxy: initialize Actor/Component transforms. #!rb none #!tests lane minion test map Change 3603343 on 2017/08/22 by robomerge #!ROBOMERGE-AUTHOR: don.eubanks Added several more stats to the Card Shop stat panel. + Basic Attack Damage + Max Move Speed + Armor Penetration / Percent + Ability Penetration / Percent Added utility function to AbilitySystemComponent to calculate an ability's value with additional Required/Ignore tags and Target tag container (functionality moved from AttributeView) #!rb matt.schembari #!tests Compile DebugGame Editor Win64 / Shipping Client PS4 / PIE #!ROBOMERGE-SOURCE: CL 3603172 in //Orion/Main/... #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3603121 on 2017/08/22 by Laurent.Delayen Added FAnimationRuntime::LerpPosesPerBone #!rb none #!tests lane minions split body anims. Change 3603010 on 2017/08/22 by Laurent.Delayen Draw box around Actor being debugged by 'ShowDebug' command, to help identify what we're viewing. #!rb none #!tests lane minions Change 3602574 on 2017/08/22 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Fixed linux warning #!tests compiled #!rb none #!ROBOMERGE-SOURCE: CL 3602571 in //Orion/Release-42.3/... via CL 3602572 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3602396 on 2017/08/22 by andrew.grant #!CodeReview: andrew.grant, jason.bestimt, jeff.williams Unresolved conflicts. andrew.grant, please merge this change by hand. //ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/Gauntlet.Automation.csproj -------------------------------------- Updated Gauntlet log parser for new callstack format Added offline and runtime Gauntlet tests to verify error generation and parsing #!tests ran lots of tests locally #!rb codereviewed #!ROBOMERGE-SOURCE: CL 3601948 in //Orion/Release-42.3/... via CL 3601950 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3602373 on 2017/08/22 by Andrew.Grant Fixed compile error #!tests compiled #!rb none Change 3602321 on 2017/08/22 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant LogAssertFailedMessage - Removed callstack dumping from LogAssertFailedMessage (now in StaticFailDebug) - Moved script dumping inside GIsCritial check StaticFailDebug - Now dumps the callstack if supported for non-ensures. This results in PS4 (and other platforms) now displaying a callstack on a Fatal log. - Removed log flush, was redundant - Removed LowLevelOutputDebugStringf. If a platform needs this it can be done later in its error device OutputMultiLineCallstack - Renamed to FDebug::LogFormattedMessageWithCallstack and exposed in headers (calling locations have been updated to remove their extern declarations) - No longer writes into the buffer to format it (!) - LogName is now the first param. If NAME_None it writes using LowLevelOutputDebugString - While writing out error information all callstack likes are prefixed with [Callstack] Added brief documentation about the order of ops for ensures/asserts/fatal logs #!tests ran lots of tests locally #!rb codereviewed #!ROBOMERGE-SOURCE: CL 3601943 in //Orion/Release-42.3/... via CL 3601944 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3602316 on 2017/08/22 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Changed various platform-specific implementations of ProgramCounterToHumanReadableString to return info in a canonical format of address module!func [file:line]. E.g. 0x00416A5F OrionClient.self!FEngineLoop::Tick() [D:\Epic\Orion\Release-Next\Engine\Source\Runtime\Launch\Private\LaunchEngineLoop.cpp:3295] #!tests ran lots of tests locally #!rb codereviewd #!ROBOMERGE-SOURCE: CL 3601940 in //Orion/Release-42.3/... via CL 3601941 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3602311 on 2017/08/22 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Sony don't allow exception handling on PS4 so for sometime we've had an issue where crashes have no presence in logs* This change adds postmortem analysis to PS4DevkitUtil. If the OS terminates the process then it process the minidump and writes the cause and the callstack to stdout. As a bonus PS4DevkitUtil can now display cause & callstacks from minidumps via "PS4DevkitUtil postmortem -dump=path\to\crash.orbisdmp" (*if you're lucky the kit may have been setup correctly to submit dumps to crashreporter, it may have actually worked, and you may be able to find it). #!tests run many times on Orion tests #!rb CR #!ROBOMERGE-SOURCE: CL 3601929 in //Orion/Release-42.3/... via CL 3601930 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3599823 on 2017/08/21 by Jian.Ru Allow MaxCascades cvar be set to 0 (should perobject shadow be forced on?) #!jira UE-48468,OR-42749 #!rb Daniel.Wright #!tests editor Change 3598765 on 2017/08/19 by Andrew.Grant Disable regeneration of missing cubemap data in cooked build. Need some way of handling this, but currently this breaks PS4 anytime someone makes a map change and doesn't build lighting... #!review-3598766 @daniel.lamb #!tests ran PS4 successfully #!rb none Change 3597800 on 2017/08/18 by Laurent.Delayen Added FAnimationRuntime::LerpPoses. Blends two poses together, but first pose is also storing results. To save on copying poses when not necessary. Removed individual use of ZERO_ANIMWEIGHT_THRESH, instead use FAnimWeight functions. FAnimationRuntime weight functions use FAnimWeight for consistency. (IsFullWeight was different). #!rb none #!codereview martin.wilson, lina.halper #!tests minion test lane map Change 3597332 on 2017/08/18 by Laurent.Delayen SkelMeshComponent LOD update only refreshes transforms when rendered. If AnimGraph eval is done, make sure Graph has been updated at least once. Fixes: - Significance Manager setting MinLOD on non recently rendered minions, causing them to refresh bones. - Minions calling eval with graph not updated due to having bUseRefPoseOnInitAnim set. It means it's possible to refresh bones on a graph that has never been updated, causing a crash. #!rb martin.wilson, lina.halper #!codereview martin.wilson, lina.halper #!tests minions test lane map. placing skelmeshes in editor and making sure LOD update works as expected. Change 3597042 on 2017/08/18 by Daniel.Lamb Added onlinesubsystemmcp to the cooksettings blacklist. #!rb Trivial #!test none Change 3596575 on 2017/08/18 by Shaun.Kime Fixing nonunity build issues #!rb none #!tests compiled OrionGame with unity builds disabled Change 3595475 on 2017/08/17 by Andrew.Grant Fixed issue with PS4 asserts not being detected during test shutdown #!tests ran locally #!rb none Change 3595415 on 2017/08/17 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Added check for network failure to tests #!tests ran locally #!rb none #!ROBOMERGE-SOURCE: CL 3595412 in //Orion/Release-42.3/... via CL 3595414 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3594725 on 2017/08/17 by Ben.Salem Add "Worst offenders" table and runtime to FX perf reports. #!rb adric.worley #!tests Ran a few FX Perf tests and generated reports. Change 3594195 on 2017/08/17 by Shaun.Kime Integration from Dev-Niagara to Dev-General. Note that this may cause assets to need to be recooked. Please be prepared for longer than normal cook times once syncing past this changelist. #!rb none #!tests preflight'ed change, QA ran multiple soak tests Change 3594177 on 2017/08/17 by Andrew.Grant Fixed issue that was causing exceptions not to be recognized #!tests ran locally #!rb none Change 3594090 on 2017/08/17 by robomerge #!ROBOMERGE-AUTHOR: laurent.delayen Fix for mesh desyncing during online play. https://jira.it.epicgames.net/browse/UE-45947 #!rb none #!tests none [CODEREVIEW] zak.middleton #!ROBOMERGE-SOURCE: CL 3590625 in //Orion/Release-42.3/... via CL 3590626 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3594022 on 2017/08/17 by Laurent.Delayen SkeletalMeshComponent::InitAnim - Do not call RefreshBoneTransforms without calling TickAnim first. AnimGraph could get in a bad state. - Do not call RefreshBoneTransforms if AnimInstance has not been initialized. - Do not call RefreshBoneTransforms if bUseRefPoseOnInitAnim is set. Which it could if bForceReinit was false. #!rb martin.wilson #!tests minion test lane map. Change 3593972 on 2017/08/17 by Chris.Bunner Duplicating instanced static mesh fixes from Dev-Editor - 3502581, 3570934, 3593597. #!rb None #!tests Editor, -game, PC #!jira UE-48521, OR-42612 Change 3590611 on 2017/08/16 by David.Ratti Spot edigrate CL 3584203 to fix show collision crash in mono 2 #!rb none #!tests compile Change 3590452 on 2017/08/16 by Laurent.Delayen Fix for mesh desyncing during online play. https://jira.it.epicgames.net/browse/UE-45947 #!rb none #!tests none #!codereview zak.middleton Change 3590378 on 2017/08/16 by Laurent.Delayen Integrated CL #!3585145 from Main. >> Fix for https://jira.it.epicgames.net/browse/OR-42337 and https://jira.it.epicgames.net/browse/OR-42338 Don't call UpdateMontageSyncGroup() when doing EMeshComponentUpdateFlag::OnlyTickMontagesWhenNotRendered. Fixed auto ranged iterator. #!rb none #!tests bot match with Twinblast << Change 3590263 on 2017/08/16 by Matt.Kuhlenschmidt Added the ability to remove vertex colors from static meshes from the content browser #!rb none #!tests none #!fyi jordan.walker Change 3590026 on 2017/08/16 by Jurre.deBaare HLOD: When mesh has auto LOD generation disabled it prevents user from dragging meshes to make a cluster #!fix changed the tooltip and error handling for cluster creation, if there is any valid mesh now it will show up as a warning #!jira OR-41584 #!rb none #!test have tested several 'error' meshes which would before prevent the user from creating a cluster, Change 3588580 on 2017/08/15 by Laurent.Delayen Fix for https://jira.it.epicgames.net/browse/OR-42755 #!rb none #!tests bot match Change 3588360 on 2017/08/15 by Charles.Anderson Phat - Fixed up the materials to turn off the Render Before DOF so that we can see what were doing in Phat again. Change 3587983 on 2017/08/15 by robomerge #!ROBOMERGE-AUTHOR: daniel.lamb Fixed up audio issue on the new dawn intro movie #!jira OR-42144 #!rb Max.Preussner #!test Paragon ps4 #!lockdown Andrew.Grant #!ROBOMERGE-SOURCE: CL 3581466 in //Orion/Release-42.1/... via CL 3581468 via CL 3581469 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3587746 on 2017/08/15 by Daniel.Lamb Build launcher now has option for custom test. Dumps generated buildcooktest commandline to log when using -interactive for reference. #!rb trivial #!test BuildCookTest with and without test options. Change 3587733 on 2017/08/15 by Daniel.Lamb Reenabled binned 2 stats in not shipping. #!rb Andrew.Grant #!test Paragon editor. Change 3587727 on 2017/08/15 by Daniel.Lamb Removed all the checks to help track down Texture GC issue. #!rb Trivial #!test Paragon editor Change 3584487 on 2017/08/14 by Laurent.Delayen https://jira.it.epicgames.net/browse/OR-42754 making sure this is not firing because of false positives. #!rb none #!tests compiles Change 3582074 on 2017/08/11 by Laurent.Delayen TimeStretchCurve system for AnimMontages. Allows adjusting playback time of montages in a non constant way. This optional curve allows the user to determine how animation frames are influenced by play back time scaling, instead of using a constant play rate scaling. For example, with an attack animation, the strike could have zero influence (no play rate), and the recovery time could have 100% influence (most play rated). This system is entirely optional and compatible with current Montage API. You still determine desired play back time via the Play Rate parameter. Based on desired playback time, if there is a curve named 'MontageTimeStretchCurve' then, it will use the curve to determine animation frames to play based on playback time and TimeStretchCurve. Otherwise, if no curve exists, it is done using the constant supplied PlayRate. #!rb martin.wilson #!codereview lina.halper, james.golding #!tests wukong primary attacks Change 3582063 on 2017/08/11 by Brian.Fasten Removing Monolith02_LowTest from automated builds until errors can be cleared #!codereview: daniel.lamb #!rb - none #!tests - none Change 3581229 on 2017/08/10 by Lina.Halper - Back out revision 21 from //Orion/Dev-General/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp - Comment out issue that causes crash in the draw box #!jira: UE-48222 #!code review: Jurre.DeBaare, Nick.Darnell, Daniel.Lamb #!rb: Jurre.DeBaare #!tests: building HLOD as specified in the ticket, and anim blueprint graph Change 3577839 on 2017/08/08 by Daniel.Lamb Revert CL 3576931. To fix crash when generating HLOD in Monolith 2. #!rb Andrew.Grant #!test Rebuild HLOD paragon editor #!fyi Lina.Halper Change 3577684 on 2017/08/08 by Andrew.Grant Removed ensure and merged proper fix for crash from UE4/Main (3572777) #!tests #!rb none Change 3577562 on 2017/08/08 by robomerge #!ROBOMERGE-AUTHOR: laurent.delayen Potential fix for https://jira.it.epicgames.net/browse/OR-42383 Clear NotifyQueue prior to ticking montages. Also dispatch events right away, since ticking ends here, and no rendering is happening. In the event TickPose() is called directly and Component does not get ticked. #!rb lina.halper [CODEREVIEW] lina.halper, martin.wilson #!tests bot match #!ROBOMERGE-SOURCE: CL 3577071 in //Orion/Main/... #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3577358 on 2017/08/08 by Harrison.Moore Updating Colorchecker Change 3576931 on 2017/08/08 by Lina.Halper Fix for missing arrowhead of the transition on state machine graph #!rb: Nick.Darnell #!tests: editor Change 3576847 on 2017/08/08 by Jason.Bestimt #!ORION_DG - OR-42361 - Removing assert that was causing crash report client to break (during shipping builds of Paragon due to directories that didn't exist) #!RB: Guillaume.Abadie #!Tests:none Change 3576794 on 2017/08/08 by Laurent.Delayen Removed call to DebugCanvas->Flush_GameThread(); to fix 'showdebug' commands not rendering anymore. #!rb Matt.Kuhlenschmidt #!codereview Matt.Kuhlenschmidt #!tests Ghost in PIE, showdebug animation works. Change 3576302 on 2017/08/08 by Jurre.deBaare Fix for Materials get switched up while building HLODs in case the section order is different than the material order #!rb none #!tests Rebuild problematic clusters in Monolith2 #!fix materials remapping was done using the section index instead of material index in the hlod path (static mesh merge one was fine) Change 3575221 on 2017/08/07 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Fix for PS4 shipping #!tests compiled PS4 shipping #!rb none #!ROBOMERGE-SOURCE: CL 3575112 in //Orion/Release-42.1/... via CL 3575114 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3575165 on 2017/08/07 by andrew.grant #!CodeReview: andrew.grant, jason.bestimt, jeff.williams Unresolved conflicts. andrew.grant, please merge this change by hand. //ROBOMERGE_ORION_Dev_General/Engine/Source/Runtime/PS4/PS4RHI/Private/GnmManager.cpp -------------------------------------- PS4 GPU time now shows correct values instead of vsync time. #!tests Ran on PS4 #!rb Luke.Thatcher #!ROBOMERGE-SOURCE: CL 3574821 in //Orion/Release-42.1/... via CL 3574823 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3574408 on 2017/08/06 by Ben.Salem Switch nightly solo smoke/fx tests to have -unattended on their commandlines. #!rb none #!tests compiled. Change 3574308 on 2017/08/06 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Include session time, MVP, and hitches on new health report #!tests ran locally #!rb none #!ROBOMERGE-SOURCE: CL 3574305 in //Orion/Release-42/... via CL 3574306 via CL 3574307 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3574217 on 2017/08/05 by Jeff.Williams Fixing UAT compile error #!review-3574218 @andrew.grant #!rb na #!tests na Change 3574139 on 2017/08/05 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant [NULL MERGE] Locked net version to 3571982 for future v42 patches #!tests #!rb none #!ROBOMERGE-SOURCE: CL 3574136 in //Orion/Release-42/... via CL 3574137 via CL 3574138 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3574130 on 2017/08/05 by andrew.grant #!CodeReview: andrew.grant, jason.bestimt, jeff.williams Unresolved conflicts. andrew.grant, please merge this change by hand. //ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/SelfTest/Gauntlet.SelfTest.LogParserTest.cs -------------------------------------- Non-shipping Gauntlet changes - Log parser cleanup that provides better access to log channel info, errors, warnings, and ensures Updated BaselinePerf test to record number of units travelled. This should highlight tests where a bot gets blocked :( #!tests ran locally on PS4 #!rb none #!ROBOMERGE-SOURCE: CL 3574116 in //Orion/Release-42/... via CL 3574123 via CL 3574124 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3573197 on 2017/08/04 by andrew.grant #!CodeReview: andrew.grant, jason.bestimt, jeff.williams Unresolved conflicts. andrew.grant, please merge this change by hand. //ROBOMERGE_ORION_Dev_General/Engine/Source/Programs/AutomationTool/NotForLicensees/Gauntlet/Gauntlet.Automation.csproj -------------------------------------- Merging //Orion/Release-42.1 to Dev-ContentUpdate (//Orion/Dev-ContentUpdate) #!tests #!rb none #!ROBOMERGE-SOURCE: CL 3573179 in //Orion/Main/... #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3573079 on 2017/08/04 by Andrew.Grant Removed some code that was preventing Wacom from working #!tests #!rb none Change 3572790 on 2017/08/04 by Jurre.deBaare Moving over fixes from 4.17 stream related to HLOD: "UE-47360 Non Uniform baking of HLOD materials causes texture stretching UE-47031 Generating a HLOD cluster with multiple actors that contain lods will not bake correctly" #!rb none #!tests none Change 3572663 on 2017/08/04 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Gauntlet - copy elf files to temp dir and launch from there #!tests ran gauntlet #!rb none #!ROBOMERGE-SOURCE: CL 3572657 in //Orion/Release-42/... via CL 3572659 via CL 3572662 #!ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3572622 on 2017/08/04 by Jurre.deBaare Moving over: "Guard against zero sized boxes being sent to the slate batcher. This was exposed by the clipping changes since zero sized elements would have been previously clipped. #!rb nick.darnell #!jira UE-46919" #!tests none Change 3572428 on 2017/08/04 by Benn.Gallagher Added per-axis inertia and parent dominance settings to physics assets #!rb Thomas.Sarkanen #!tests Shrapnel in editor and -game (seems to be the only character using old inertia scaler for rigid body node) Change 3572142 on 2017/08/04 by robomerge #!ROBOMERGE-AUTHOR: andrew.grant Disabling r.Cache.UpdatePrimsTaskEnabled for PS4 due to lock-ups #!tests none #!rb none #!ROBOMERGE-SOURCE: CL |
||
|
|
ddf25c16cf |
Branch snapshot for CL 3555263
[CL 3555263 in Main branch] |