birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:00f8a158fcfb667b060c902ed2129024f5041816e299c9cace2370f4ac60287d
size 10762
oid sha256:ec428aee9c49ffd58a00fdcbb0625185a22f5690f7b2e81326ef5443699019e6
size 10945
AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas
+5187 -4342
View File
File diff suppressed because it is too large Load Diff
AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml
+45 -45
View File
@@ -1,17 +1,17 @@
<TimeOfDay Time="13.5" TimeStart="13.5" TimeEnd="13.5" TimeAnimSpeed="0">
<Variable Name="Sun color" Color="0.99989021,0.99946922,0.9991194">
<Variable Name="Sun color" Color="0.78353798,0.89626998,0.93034101">
<Spline Keys="-0.000628322:(0.783538:0.89627:0.930341):36"/>
</Variable>
<Variable Name="Sun intensity" Value="92366.688">
<Variable Name="Sun intensity" Value="1000">
<Spline Keys="0:1000:36"/>
</Variable>
<Variable Name="Sun specular multiplier" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Fog color" Color="0.27049801,0.47353199,0.83076996">
<Variable Name="Fog color" Color="0.0065120901,0.0097212195,0.0137021">
<Spline Keys="0:(0.00651209:0.00972122:0.0137021):36"/>
</Variable>
<Variable Name="Fog color multiplier" Value="1">
<Variable Name="Fog color multiplier" Value="0.5">
<Spline Keys="0:0.5:36"/>
</Variable>
<Variable Name="Fog height (bottom)" Value="0">
@@ -20,31 +20,31 @@
<Variable Name="Fog layer density (bottom)" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Fog color (top)" Color="0.597202,0.72305501,0.91309899">
<Variable Name="Fog color (top)" Color="0.0069954102,0.0097212195,0.0122865">
<Spline Keys="0:(0.00699541:0.00972122:0.0122865):36"/>
</Variable>
<Variable Name="Fog color (top) multiplier" Value="0.88389361">
<Variable Name="Fog color (top) multiplier" Value="0.5">
<Spline Keys="-4.40702e-06:0.5:36"/>
</Variable>
<Variable Name="Fog height (top)" Value="100">
<Spline Keys="0:100:36"/>
</Variable>
<Variable Name="Fog layer density (top)" Value="0.0001">
<Variable Name="Fog layer density (top)" Value="9.9999997e-05">
<Spline Keys="0:0.0001:36"/>
</Variable>
<Variable Name="Fog color height offset" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Fog color (radial)" Color="0.78592348,0.52744436,0.17234583">
<Variable Name="Fog color (radial)" Color="0,0,0">
<Spline Keys="0:(0:0:0):36"/>
</Variable>
<Variable Name="Fog color (radial) multiplier" Value="6">
<Variable Name="Fog color (radial) multiplier" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Fog radial size" Value="0.85000002">
<Variable Name="Fog radial size" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Fog radial lobe" Value="0.75">
<Variable Name="Fog radial lobe" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Volumetric fog: Final density clamp" Value="1">
@@ -56,7 +56,7 @@
<Variable Name="Volumetric fog: Ramp start" Value="25">
<Spline Keys="0:25:36"/>
</Variable>
<Variable Name="Volumetric fog: Ramp end" Value="1000.0001">
<Variable Name="Volumetric fog: Ramp end" Value="1000">
<Spline Keys="0:1000:36"/>
</Variable>
<Variable Name="Volumetric fog: Ramp influence" Value="0.69999999">
@@ -83,10 +83,10 @@
<Variable Name="Volumetric fog 2: Fog height (top)" Value="4000">
<Spline Keys="0:4000:0"/>
</Variable>
<Variable Name="Volumetric fog 2: Fog layer density (top)" Value="9.999999e-05">
<Variable Name="Volumetric fog 2: Fog layer density (top)" Value="9.9999997e-05">
<Spline Keys="0:0.0001:0"/>
</Variable>
<Variable Name="Volumetric fog 2: Global fog density" Value="0.099999994">
<Variable Name="Volumetric fog 2: Global fog density" Value="0.1">
<Spline Keys="0:0.1:0"/>
</Variable>
<Variable Name="Volumetric fog 2: Ramp start" Value="0">
@@ -104,7 +104,7 @@
<Variable Name="Volumetric fog 2: Fog albedo color (sun radial)" Color="1,1,1">
<Spline Keys="0:(1:1:1):0"/>
</Variable>
<Variable Name="Volumetric fog 2: Anisotropy factor (sun radial)" Value="0.94999993">
<Variable Name="Volumetric fog 2: Anisotropy factor (sun radial)" Value="0.94999999">
<Spline Keys="0:0.95:0"/>
</Variable>
<Variable Name="Volumetric fog 2: Blend factor for sun scattering" Value="1">
@@ -140,7 +140,7 @@
<Variable Name="Sky light: Sun intensity multiplier" Value="200">
<Spline Keys="0:200:36"/>
</Variable>
<Variable Name="Sky light: Mie scattering" Value="6.779707">
<Variable Name="Sky light: Mie scattering" Value="40">
<Spline Keys="0:40:36"/>
</Variable>
<Variable Name="Sky light: Rayleigh scattering" Value="0.2">
@@ -149,7 +149,7 @@
<Variable Name="Sky light: Sun anisotropy factor" Value="-0.99989998">
<Spline Keys="0:-0.9999:36"/>
</Variable>
<Variable Name="Sky light: Wavelength (R)" Value="694.00006">
<Variable Name="Sky light: Wavelength (R)" Value="694">
<Spline Keys="0:694:36"/>
</Variable>
<Variable Name="Sky light: Wavelength (G)" Value="597">
@@ -158,76 +158,76 @@
<Variable Name="Sky light: Wavelength (B)" Value="488">
<Spline Keys="0:488:36"/>
</Variable>
<Variable Name="Night sky: Horizon color" Color="0.27049801,0.39157301,0.52711499">
<Variable Name="Night sky: Horizon color" Color="0.27049801,0.39157301,0.52099597">
<Spline Keys="0:(0.270498:0.391573:0.520996):36"/>
</Variable>
<Variable Name="Night sky: Horizon color multiplier" Value="0">
<Variable Name="Night sky: Horizon color multiplier" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
<Variable Name="Night sky: Zenith color" Color="0.36130697,0.434154,0.46778399">
<Variable Name="Night sky: Zenith color" Color="0.361307,0.434154,0.46778399">
<Spline Keys="0:(0.361307:0.434154:0.467784):36"/>
</Variable>
<Variable Name="Night sky: Zenith color multiplier" Value="0">
<Variable Name="Night sky: Zenith color multiplier" Value="0.02">
<Spline Keys="0:0.02:36"/>
</Variable>
<Variable Name="Night sky: Zenith shift" Value="0.5">
<Spline Keys="0:0.5:36"/>
</Variable>
<Variable Name="Night sky: Star intensity" Value="0">
<Variable Name="Night sky: Star intensity" Value="3">
<Spline Keys="0:3:36"/>
</Variable>
<Variable Name="Night sky: Moon color" Color="1,1,1">
<Spline Keys="0:(1:1:1):36"/>
</Variable>
<Variable Name="Night sky: Moon color multiplier" Value="0">
<Variable Name="Night sky: Moon color multiplier" Value="0.40000001">
<Spline Keys="0:0.4:36"/>
</Variable>
<Variable Name="Night sky: Moon inner corona color" Color="0.904661,1,1">
<Variable Name="Night sky: Moon inner corona color" Color="0.89626998,1,1">
<Spline Keys="0:(0.89627:1:1):36"/>
</Variable>
<Variable Name="Night sky: Moon inner corona color multiplier" Value="0">
<Variable Name="Night sky: Moon inner corona color multiplier" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
<Variable Name="Night sky: Moon inner corona scale" Value="0">
<Variable Name="Night sky: Moon inner corona scale" Value="2">
<Spline Keys="0:2:36"/>
</Variable>
<Variable Name="Night sky: Moon outer corona color" Color="0.201556,0.22696599,0.25415203">
<Variable Name="Night sky: Moon outer corona color" Color="0.19806901,0.22696599,0.25015801">
<Spline Keys="0:(0.198069:0.226966:0.250158):36"/>
</Variable>
<Variable Name="Night sky: Moon outer corona color multiplier" Value="0">
<Variable Name="Night sky: Moon outer corona color multiplier" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
<Variable Name="Night sky: Moon outer corona scale" Value="0">
<Variable Name="Night sky: Moon outer corona scale" Value="0.0099999998">
<Spline Keys="0:0.01:36"/>
</Variable>
<Variable Name="Cloud shading: Sun light multiplier" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Cloud shading: Sun custom color" Color="0.83076996,0.76815104,0.65837508">
<Variable Name="Cloud shading: Sun custom color" Color="0.73791099,0.73791099,0.73791099">
<Spline Keys="0:(0.737911:0.737911:0.737911):36"/>
</Variable>
<Variable Name="Cloud shading: Sun custom color multiplier" Value="1">
<Variable Name="Cloud shading: Sun custom color multiplier" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
<Variable Name="Cloud shading: Sun custom color influence" Value="0">
<Variable Name="Cloud shading: Sun custom color influence" Value="0.5">
<Spline Keys="0:0.5:36"/>
</Variable>
<Variable Name="Sun shafts visibility" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Sun rays visibility" Value="1.5">
<Variable Name="Sun rays visibility" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Sun rays attenuation" Value="1.5">
<Variable Name="Sun rays attenuation" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
<Variable Name="Sun rays suncolor influence" Value="0.5">
<Spline Keys="0:0.5:36"/>
</Variable>
<Variable Name="Sun rays custom color" Color="0.66538697,0.83879906,0.94730699">
<Variable Name="Sun rays custom color" Color="0.66538697,0.838799,0.94730699">
<Spline Keys="0:(0.665387:0.838799:0.947307):36"/>
</Variable>
<Variable Name="Ocean fog color" Color="0.0012141101,0.0091340598,0.017642001">
<Variable Name="Ocean fog color" Color="0.0012141099,0.0091340598,0.017642001">
<Spline Keys="0:(0.00121411:0.00913406:0.017642):36"/>
</Variable>
<Variable Name="Ocean fog color multiplier" Value="0.5">
@@ -239,10 +239,10 @@
<Variable Name="Static skybox multiplier" Value="1">
<Spline Keys="0:1:0"/>
</Variable>
<Variable Name="Film curve shoulder scale" Value="2.2322128">
<Variable Name="Film curve shoulder scale" Value="3">
<Spline Keys="0:3:36"/>
</Variable>
<Variable Name="Film curve midtones scale" Value="0.88389361">
<Variable Name="Film curve midtones scale" Value="0.5">
<Spline Keys="0:0.5:36"/>
</Variable>
<Variable Name="Film curve toe scale" Value="1">
@@ -251,7 +251,7 @@
<Variable Name="Film curve whitepoint" Value="4">
<Spline Keys="0:4:36"/>
</Variable>
<Variable Name="Saturation" Value="1">
<Variable Name="Saturation" Value="0.80000001">
<Spline Keys="0:0.8:36"/>
</Variable>
<Variable Name="Color balance" Color="1,1,1">
@@ -263,7 +263,7 @@
<Variable Name="Min exposure" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Max exposure" Value="2.6142297">
<Variable Name="Max exposure" Value="2">
<Spline Keys="0:2:36"/>
</Variable>
<Variable Name="EV Min" Value="4.5">
@@ -275,10 +275,10 @@
<Variable Name="EV Auto compensation" Value="1.5">
<Spline Keys="0:1.5:0"/>
</Variable>
<Variable Name="Bloom amount" Value="0.30899152">
<Variable Name="Bloom amount" Value="1">
<Spline Keys="0:1:36"/>
</Variable>
<Variable Name="Filters: grain" Value="0">
<Variable Name="Filters: grain" Value="0.30000001">
<Spline Keys="0:0.3:65572"/>
</Variable>
<Variable Name="Filters: photofilter color" Color="0,0,0">
@@ -287,7 +287,7 @@
<Variable Name="Filters: photofilter density" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Dof: focus range" Value="500.00003">
<Variable Name="Dof: focus range" Value="500">
<Spline Keys="0:500:36"/>
</Variable>
<Variable Name="Dof: blur amount" Value="0.1">
@@ -341,7 +341,7 @@
<Variable Name="Cascade 7: Slope Bias" Value="1">
<Spline Keys="0:1:0"/>
</Variable>
<Variable Name="Shadow jittering" Value="2.5">
<Variable Name="Shadow jittering" Value="5">
<Spline Keys="0:5:36"/>
</Variable>
<Variable Name="HDR dynamic power factor" Value="0">
@@ -350,7 +350,7 @@
<Variable Name="Sky brightening (terrain occlusion)" Value="0">
<Spline Keys="0:0:36"/>
</Variable>
<Variable Name="Sun color multiplier" Value="10">
<Variable Name="Sun color multiplier" Value="0.1">
<Spline Keys="0:0.1:36"/>
</Variable>
</TimeOfDay>