Merge pull request #6001 from acemod/fishykins-master

add allowFadeMusic setting
This commit is contained in:
commy2 2018-01-02 17:12:47 +01:00 committed by GitHub
commit 183fc93c5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 10 deletions

View File

@ -41,14 +41,6 @@ isHC = !hasInterface && !isDedicated; // deprecated because no tag
missionNamespace setVariable ["ACE_isHC", ACE_isHC];
uiNamespace setVariable ["ACE_isHC", ACE_isHC];
[
QGVAR(persistentLaserEnabled),
"CHECKBOX",
[localize LSTRING(SettingPersistentLaserName), localize LSTRING(SettingPersistentLaserDesc)],
localize LSTRING(ACEKeybindCategoryWeapons),
false,
false,
LINKFUNC(switchPersistentLaser)
] call CBA_settings_fnc_init;
#include "initSettings.sqf"
ADDON = true;

View File

@ -47,7 +47,9 @@ if (!_exists && _add) then {
// in game sounds
0 fadeSound _lowestVolume;
0 fadeRadio _lowestVolume;
if (GVAR(allowFadeMusic)) then {
0 fadeMusic _lowestVolume;
};
// Set Radio mod variables.
ACE_player setVariable ["tf_globalVolume", _lowestVolume];

View File

@ -0,0 +1,18 @@
[
QGVAR(persistentLaserEnabled),
"CHECKBOX",
[LSTRING(SettingPersistentLaserName), LSTRING(SettingPersistentLaserDesc)],
localize LSTRING(ACEKeybindCategoryWeapons),
false,
false,
LINKFUNC(switchPersistentLaser)
] call CBA_settings_fnc_init;
[
QGVAR(allowFadeMusic),
"CHECKBOX",
[LSTRING(AllowFadeMusic), LSTRING(AllowFadeMusicTooltip)],
localize LSTRING(ACEKeybindCategoryCommon),
true,
true
] call CBA_settings_fnc_init;

View File

@ -1151,5 +1151,13 @@
<Chinesesimp>重量:</Chinesesimp>
<Chinese>重量:</Chinese>
</Key>
<Key ID="STR_ACE_Common_AllowFadeMusic">
<English>Allow turning down music</English>
<German>Erlaube Musik leiser stellen</German>
</Key>
<Key ID="STR_ACE_Common_AllowFadeMusicTooltip">
<English>Allow ACE scripts to turn down the music.</English>
<German>Erlaube ACE-Skripten, die Musik leiser zu stellen.</German>
</Key>
</Package>
</Project>