Merge branch 'GuiProfileSoundAssets' of https://github.com/marauder2k9-torque/Torque3D into alpha401/resolveAudioConflict

# Conflicts:
#	Templates/BaseGame/game/data/UI/UI.tscript
#	Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
#	Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
This commit is contained in:
AzaezelX 2022-08-29 17:47:07 -05:00
commit 4590e14a13
10 changed files with 89 additions and 114 deletions

View file

@ -1,4 +1,10 @@
<SoundAsset
AssetName="buttonClick"
soundFile="@assetFile=buttonClick.wav"
sourceGroup="AudioChannelGui"/>
<SoundAsset
AssetName="buttonClick"
soundFile="@assetFile=buttonClick.wav"
PitchAdjust="1"
VolumeAdjust="1"
is3D="false"
minDistance="1"
maxDistance="100"
sourceGroup="AudioChannelGui"
/>

View file

@ -1,6 +1,10 @@
<SoundAsset
AssetName="buttonHover"
soundFile="@assetFile=buttonHover.wav"
useHardware="true"
maxDistance="120"
sourceGroup="AudioChannelGui"/>
<SoundAsset
AssetName="buttonHover"
soundFile="@assetFile=buttonHover.wav"
PitchAdjust="1"
VolumeAdjust="1"
is3D="false"
minDistance="1"
maxDistance="100"
sourceGroup="AudioChannelGui"
/>