Merge remote-tracking branch 'origin/master' into navigation-features

# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
This commit is contained in:
Wojtek Figat
2021-01-04 14:31:56 +01:00
2425 changed files with 4606 additions and 30937 deletions

View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#pragma once
@@ -19,7 +19,7 @@ public:
bool DisableAudio = false;
/// <summary>
/// The doppler doppler effect factor. Scale for source and listener velocities. Default is 1.
/// The doppler effect factor. Scale for source and listener velocities. Default is 1.
/// </summary>
float DopplerFactor = 1.0f;