TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #329 from thecelloman/cleansounds

Browse source 
Remove unused and duplicate sounds.
This commit is contained in:
SilentMike 2013-04-11 12:40:56 -07:00
commit 00513230b3
36 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Templates/Empty/game/core/art/sound/volumeTest.wav → Templates/Empty/game/art/sound/ui/volumeTest.wav
View file

4
Templates/Empty/game/scripts/gui/optionsDlg.cs
View file

@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
$pref::SFX::masterVolume = %volume; $pref::SFX::masterVolume = %volume;
if( !isObject( $AudioTestHandle ) ) if( !isObject( $AudioTestHandle ) )
$AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" ); $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
} }
function OptAudioUpdateChannelVolume( %description, %volume ) function OptAudioUpdateChannelVolume( %description, %volume )
@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
if( !isObject( $AudioTestHandle ) ) if( !isObject( $AudioTestHandle ) )
{ {
$AudioTestDescription.volume = %volume; $AudioTestDescription.volume = %volume;
$AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" ); $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
} }
} }

7
Templates/Full/game/art/datablocks/audioProfiles.cs
View file

@ -33,10 +33,3 @@ datablock SFXProfile(ThrowSnd)
description = AudioClose3d; description = AudioClose3d;
preload = false; preload = false;
}; };
datablock SFXProfile(OOBWarningSnd)
{
filename = "art/sound/orc_pain";
description = "AudioLoop2D";
preload = false;
};

2
Templates/Full/game/art/datablocks/weapons/Lurker.cs
View file

@ -68,7 +68,7 @@ datablock SFXPlayList(LurkerFireSoundList)
/*datablock SFXProfile(BulletImpactSound) /*datablock SFXProfile(BulletImpactSound)
{ {
filename = "art/sound/CT_fx/weapons/SCARFIRE"; filename = "art/sound/weapons/SCARFIRE";
description = AudioClose3D; description = AudioClose3D;
preload = true; preload = true;
};*/ };*/

2
Templates/Full/game/art/datablocks/weapons/grenadefx.cs
View file

@ -22,7 +22,7 @@ $GrenadeUpVectorOffset = "0 0 1";
datablock SFXProfile(GrenadeExplosionSound) datablock SFXProfile(GrenadeExplosionSound)
{ {
filename = "art/sound/CT_fx/weapons/GRENADELAND.wav"; filename = "art/sound/weapons/GRENADELAND.wav";
description = AudioDefault3d; description = AudioDefault3d;
preload = true; preload = true;
}; };

BIN
Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav
View file

Binary file not shown.

0
Templates/Full/game/core/art/sound/volumeTest.wav → Templates/Full/game/art/sound/ui/volumeTest.wav
View file

BIN
Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg
View file

Binary file not shown.

0
Templates/Full/game/art/sound/CT_fx/weapons/GRENADELAND.wav → Templates/Full/game/art/sound/weapons/GRENADELAND.wav
View file

0
Templates/Full/game/art/sound/CT_fx/weapons/SCARFIRE.wav → Templates/Full/game/art/sound/weapons/SCARFIRE.wav
View file

BIN
Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/shot.ogg
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_fire.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_idle.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_reload.wav
View file

Binary file not shown.

BIN
Templates/Full/game/art/sound/weapons/wpn_switchin.wav
View file

Binary file not shown.

4
Templates/Full/game/scripts/gui/optionsDlg.cs
View file

@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
$pref::SFX::masterVolume = %volume; $pref::SFX::masterVolume = %volume;
if( !isObject( $AudioTestHandle ) ) if( !isObject( $AudioTestHandle ) )
$AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" ); $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
} }
function OptAudioUpdateChannelVolume( %description, %volume ) function OptAudioUpdateChannelVolume( %description, %volume )
@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
if( !isObject( $AudioTestHandle ) ) if( !isObject( $AudioTestHandle ) )
{ {
$AudioTestDescription.volume = %volume; $AudioTestDescription.volume = %volume;
$AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" ); $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
} }
} }