TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

3
Templates/BaseGame/game/data/UI/UI.tscript
View file

@ -29,9 +29,6 @@ function UI::onDestroyGameServer(%this){}
function UI::initClient(%this)
{
//Load UI stuff
//we need to load this because some of the menu profiles use the sounds here
%this.queueExec("./datablocks/guiSounds");
//Profiles
%this.queueExec("./scripts/profiles");

4
Templates/BaseGame/game/data/UI/scripts/profiles.tscript
View file

@ -100,8 +100,8 @@ new GuiControlProfile( GuiMenuButtonProfile )
canKeyFocus = false;
//bitmapAsset = "UI:menu_button_image";
hasBitmapArray = false;
soundButtonDown = menuButtonPressed;
soundButtonOver = menuButtonHover;
soundButtonDown = "UI:buttonClick";
soundButtonOver = "UI:buttonHover";
category = "Core";
};

14
Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
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"
/>

16
Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
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"
/>