Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/Scripts/Editor/FBXImporter/processed_fbx.txt # Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx
This commit is contained in:
@@ -73,7 +73,7 @@ MonoBehaviour:
|
||||
m_MaximumHardwareTimeoutMs: 1000
|
||||
m_DebugOutOfRangeCheckEnabled: 0
|
||||
m_DebugOutOfRangeLimit: 16
|
||||
m_SuspendAudioDuringFocusLoss: 1
|
||||
m_SuspendAudioDuringFocusLoss: 0
|
||||
m_RenderDuringFocusLoss: 0
|
||||
m_SoundBankPersistentDataPath:
|
||||
m_UseSubFoldersForGeneratedFiles: 0
|
||||
|
||||
@@ -61,7 +61,6 @@ MonoBehaviour:
|
||||
- AdvancedSettings.m_MaximumHardwareTimeoutMs
|
||||
- AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor
|
||||
- AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees
|
||||
- AdvancedSettings.m_SuspendAudioDuringFocusLoss
|
||||
- AdvancedSettings.m_RenderDuringFocusLoss
|
||||
- AdvancedSettings.m_SoundBankPersistentDataPath
|
||||
- AdvancedSettings.m_DebugOutOfRangeCheckEnabled
|
||||
@@ -131,7 +130,7 @@ MonoBehaviour:
|
||||
m_MaximumHardwareTimeoutMs: 1000
|
||||
m_DebugOutOfRangeCheckEnabled: 0
|
||||
m_DebugOutOfRangeLimit: 16
|
||||
m_SuspendAudioDuringFocusLoss: 1
|
||||
m_SuspendAudioDuringFocusLoss: 0
|
||||
m_RenderDuringFocusLoss: 0
|
||||
m_SoundBankPersistentDataPath:
|
||||
m_UseSubFoldersForGeneratedFiles: 0
|
||||
|
||||
@@ -61,7 +61,6 @@ MonoBehaviour:
|
||||
- AdvancedSettings.m_MaximumHardwareTimeoutMs
|
||||
- AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor
|
||||
- AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees
|
||||
- AdvancedSettings.m_SuspendAudioDuringFocusLoss
|
||||
- AdvancedSettings.m_RenderDuringFocusLoss
|
||||
- AdvancedSettings.m_SoundBankPersistentDataPath
|
||||
- AdvancedSettings.m_DebugOutOfRangeCheckEnabled
|
||||
@@ -131,7 +130,7 @@ MonoBehaviour:
|
||||
m_MaximumHardwareTimeoutMs: 1000
|
||||
m_DebugOutOfRangeCheckEnabled: 0
|
||||
m_DebugOutOfRangeLimit: 16
|
||||
m_SuspendAudioDuringFocusLoss: 1
|
||||
m_SuspendAudioDuringFocusLoss: 0
|
||||
m_RenderDuringFocusLoss: 0
|
||||
m_SoundBankPersistentDataPath:
|
||||
m_UseSubFoldersForGeneratedFiles: 0
|
||||
|
||||
Reference in New Issue
Block a user