Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into interactMoreOptions

Browse Source 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
This commit is contained in:
esteldunedain 2015-05-01 00:04:22 -03:00
commit aa4a5539d4
27 changed files with 72 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -88,3 +88,4 @@ Coren <coren4@gmail.com>
OnkelDisMaster <onkeldismaster@gmail.com> OnkelDisMaster <onkeldismaster@gmail.com>
Dimaslg <dimaslg@telecable.e> Dimaslg <dimaslg@telecable.e>
VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com> VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
Bla1337 <t3hslowpoke@gmail.com>

0
ace_breakLine.dll → ace_break_line.dll
View File

2
addons/advanced_ballistics/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey", ["ACE3 Equipment", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/atragmx/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey", ["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

6
addons/fcs/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2 // by commy2
["ACE3", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget", ["ACE3 Vehicles", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -30,7 +30,7 @@
}, },
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key
["ACE3", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp", ["ACE3 Vehicles", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -44,7 +44,7 @@
{false}, {false},
[201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key [201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key
["ACE3", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown", ["ACE3 Vehicles", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/grenades/XEH_postInit.sqf
View File

@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
// Add keybinds // Add keybinds
["ACE3", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode", ["ACE3 Weapons", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/interact_menu/config.cpp
View File

@ -92,5 +92,5 @@ class ACE_Settings {
}; };
class ACE_Extensions { class ACE_Extensions {
extensions[] += {"ace_breakLine"}; extensions[] += {"ace_break_line"};
}; };

2
addons/interact_menu/functions/fnc_renderIcon.sqf
View File

@ -33,7 +33,7 @@ if(_icon == "") then {
_text = if (GVAR(UseListMenu)) then { _text = if (GVAR(UseListMenu)) then {
format ["<img image='%1' align='left'/><t %2>%3</t>", _icon, _textSettings, _text] format ["<img image='%1' align='left'/><t %2>%3</t>", _icon, _textSettings, _text]
} else { } else {
format ["<img image='%1' align='center'/><br/><t %2 align='center'>%3</t>", _icon, _textSettings, "ace_breakLine" callExtension _text]; format ["<img image='%1' align='center'/><br/><t %2 align='center'>%3</t>", _icon, _textSettings, "ace_break_line" callExtension _text];
}; };
//_ctrl ctrlSetStructuredText parseText _text; //_ctrl ctrlSetStructuredText parseText _text;

4
addons/javelin/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2 // by commy2
["ACE3", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget", ["ACE3 Weapons", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget",
{ {
if (GETGVAR(isLockKeyDown,false)) exitWith {false}; if (GETGVAR(isLockKeyDown,false)) exitWith {false};
@ -21,7 +21,7 @@
}, },
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key
["ACE3", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode", ["ACE3 Weapons", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode",
{ false }, { false },
{ {
[ACE_player] call FUNC(cycleFireMode); [ACE_player] call FUNC(cycleFireMode);

4
addons/kestrel4500/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3", QGVAR(KestrelDialogKey), localize "STR_ACE_Kestrel4500_KestrelDialogKey", ["ACE3 Equipment", QGVAR(KestrelDialogKey), localize "STR_ACE_Kestrel4500_KestrelDialogKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -10,7 +10,7 @@
{false}, {false},
[0, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // (empty default key) [0, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // (empty default key)
["ACE3", QGVAR(DisplayKestrelKey), localize "STR_ACE_Kestrel4500_DisplayKestrelKey", ["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize "STR_ACE_Kestrel4500_DisplayKestrelKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/laserpointer/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2 // by commy2
["ACE3", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight", ["ACE3 Weapons", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/microdagr/XEH_clientInit.sqf
View File

@ -4,7 +4,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
//Add Keybinds: //Add Keybinds:
["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"), ["ACE3 Equipment", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -17,7 +17,7 @@ if (!hasInterface) exitWith {};
{false}, {false},
[0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key [0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key
["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"), ["ACE3 Equipment", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/movement/XEH_postInit.sqf
View File

@ -20,7 +20,7 @@ if (!hasInterface) exitWith {};
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["ACE3", QGVAR(climb), localize "STR_ACE_Movement_Climb", ["ACE3 Movement", QGVAR(climb), localize "STR_ACE_Movement_Climb",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/nightvision/XEH_postInitClient.sqf
View File

@ -37,7 +37,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); ["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
// Add keybinds // Add keybinds
["ACE3", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness", ["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -51,7 +51,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
{false}, {false},
[201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT [201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT
["ACE3", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness", ["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/overheating/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon", ["ACE3 Weapons", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/parachute/XEH_postInit.sqf
View File

@ -17,7 +17,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
["ACE3", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter", ["ACE3 Equipment", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/reload/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo", ["ACE3 Weapons", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

12
addons/respawn/CfgVehicles.hpp
View File

@ -96,7 +96,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; displayName = "$STR_ACE_Respawn_TeleportToRallypoint";
distance = 4; distance = 4;
condition = QUOTE(side group _player == west); condition = QUOTE(side group _player == west);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West')] call FUNC(teleportToRallypoint));
@ -116,7 +116,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; displayName = "$STR_ACE_Respawn_TeleportToRallypoint";
distance = 4; distance = 4;
condition = QUOTE(side group _player == east); condition = QUOTE(side group _player == east);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East')] call FUNC(teleportToRallypoint));
@ -136,7 +136,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; displayName = "$STR_ACE_Respawn_TeleportToRallypoint";
distance = 4; distance = 4;
condition = QUOTE(side group _player == independent); condition = QUOTE(side group _player == independent);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent')] call FUNC(teleportToRallypoint));
@ -157,7 +157,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToBase"; displayName = "$STR_ACE_Respawn_TeleportToBase";
distance = 4; distance = 4;
condition = QUOTE(side group _player == west); condition = QUOTE(side group _player == west);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West_Base')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West_Base')] call FUNC(teleportToRallypoint));
@ -177,7 +177,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToBase"; displayName = "$STR_ACE_Respawn_TeleportToBase";
distance = 4; distance = 4;
condition = QUOTE(side group _player == east); condition = QUOTE(side group _player == east);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East_Base')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East_Base')] call FUNC(teleportToRallypoint));
@ -197,7 +197,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions { class ACE_Actions: ACE_Actions {
class ACE_Teleport { class ACE_Teleport {
displayName = "$STR_ACE_Respawn_TeleportedToBase"; displayName = "$STR_ACE_Respawn_TeleportToBase";
distance = 4; distance = 4;
condition = QUOTE(side group _player == independent); condition = QUOTE(side group _player == independent);
statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent_Base')] call FUNC(teleportToRallypoint)); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent_Base')] call FUNC(teleportToRallypoint));

8
addons/respawn/stringtable.xml
View File

@ -25,6 +25,14 @@
<Italian>Rallypoint dispiegato</Italian> <Italian>Rallypoint dispiegato</Italian>
<Portuguese>Rallypoints posicionado</Portuguese> <Portuguese>Rallypoints posicionado</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_Respawn_TeleportToBase">
<English>Teleport to Base</English>
<German>Zur Basis teleportieren</German>
</Key>
<Key ID="STR_ACE_Respawn_TeleportToRallypoint">
<English>Teleport to Rallypoint</English>
<German>Zum Rallypoint teleportieren</German>
</Key>
<Key ID="STR_ACE_Respawn_TeleportedToBase"> <Key ID="STR_ACE_Respawn_TeleportedToBase">
<English>Teleported to Base</English> <English>Teleported to Base</English>
<French>Téléporté à la base</French> <French>Téléporté à la base</French>

2
addons/safemode/XEH_postInit.sqf
View File

@ -9,7 +9,7 @@ if (!hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode", ["ACE3 Weapons", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};

16
addons/scopes/XEH_postInit.sqf
View File

@ -33,7 +33,7 @@ if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(AdjustUpMinor), localize "STR_ACE_Scopes_AdjustUpMinor", ["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize "STR_ACE_Scopes_AdjustUpMinor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -46,7 +46,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [false, false, false]], true] call cba_fnc_addKeybind; [201, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustDownMinor), localize "STR_ACE_Scopes_AdjustDownMinor", ["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize "STR_ACE_Scopes_AdjustDownMinor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -59,7 +59,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [false, false, false]], true] call cba_fnc_addKeybind; [209, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustLeftMinor), localize "STR_ACE_Scopes_AdjustLeftMinor", ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize "STR_ACE_Scopes_AdjustLeftMinor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -72,7 +72,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [false, true, false]], true] call cba_fnc_addKeybind; [209, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustRightMinor), localize "STR_ACE_Scopes_AdjustRightMinor", ["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize "STR_ACE_Scopes_AdjustRightMinor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -85,7 +85,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [false, true, false]], true] call cba_fnc_addKeybind; [201, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustUpMajor), localize "STR_ACE_Scopes_AdjustUpMajor", ["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize "STR_ACE_Scopes_AdjustUpMajor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -98,7 +98,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [true, false, false]], true] call cba_fnc_addKeybind; [201, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustDownMajor), localize "STR_ACE_Scopes_AdjustDownMajor", ["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize "STR_ACE_Scopes_AdjustDownMajor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -111,7 +111,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [true, false, false]], true] call cba_fnc_addKeybind; [209, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustLeftMajor), localize "STR_ACE_Scopes_AdjustLeftMajor", ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize "STR_ACE_Scopes_AdjustLeftMajor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -124,7 +124,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [true, true, false]], true] call cba_fnc_addKeybind; [209, [true, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustRightMajor), localize "STR_ACE_Scopes_AdjustRightMajor", ["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize "STR_ACE_Scopes_AdjustRightMajor",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/vector/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2 // by commy2
["ACE3", QGVAR(AzimuthKey), localize "STR_ACE_Vector_AzimuthKey", ["ACE3 Equipment", QGVAR(AzimuthKey), localize "STR_ACE_Vector_AzimuthKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -29,7 +29,7 @@
[15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key [15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key
["ACE3", QGVAR(DistanceKey), localize "STR_ACE_Vector_DistanceKey", ["ACE3 Equipment", QGVAR(DistanceKey), localize "STR_ACE_Vector_DistanceKey",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/vehicles/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter", ["ACE3 Vehicles", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false};

28
addons/weaponselect/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol", ["ACE3 Weapons", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -18,7 +18,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
["ACE3", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", ["ACE3 Weapons", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -32,7 +32,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
["ACE3", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", ["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -46,7 +46,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
["ACE3", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", ["ACE3 Weapons", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -60,7 +60,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
["ACE3", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", ["ACE3 Weapons", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -74,7 +74,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", ["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -88,7 +88,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key
["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", ["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -102,7 +102,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key
["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", ["ACE3 Weapons", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -116,7 +116,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key
["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", ["ACE3 Vehicles", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -130,7 +130,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", ["ACE3 Vehicles", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -144,7 +144,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
["ACE3", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", ["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -158,7 +158,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
["ACE3", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", ["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -172,7 +172,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
["ACE3", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", ["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -186,7 +186,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", ["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
extensions/CMakeLists.txt
View File

@ -55,7 +55,7 @@ set(GLOBAL_SOURCES ${GLOBAL_RC})
# Add extensions to build here # Add extensions to build here
add_subdirectory(fcs) add_subdirectory(fcs)
add_subdirectory(breakLine) add_subdirectory(break_line)
add_subdirectory(advanced_ballistics) add_subdirectory(advanced_ballistics)
message("Build Type: ${CMAKE_BUILD_TYPE}") message("Build Type: ${CMAKE_BUILD_TYPE}")

2
extensions/breakLine/CMakeLists.txt → extensions/break_line/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(ACE_EXTENSION_NAME "ace_breakLine") set(ACE_EXTENSION_NAME "ace_break_line")
file(GLOB SOURCES *.h *.hpp *.c *.cpp) file(GLOB SOURCES *.h *.hpp *.c *.cpp)
add_library( ${ACE_EXTENSION_NAME} SHARED ${GLOBAL_SOURCES} ${SOURCES}) add_library( ${ACE_EXTENSION_NAME} SHARED ${GLOBAL_SOURCES} ${SOURCES})

2
extensions/breakLine/ace_breakLine.cpp → extensions/break_line/ace_break_line.cpp
View File

@ -1,5 +1,5 @@
/* /*
* ace_breakLine.cpp * ace_break_line.cpp
* *
* Takes a string and insert as many line breaks as needed so it fits a given width * Takes a string and insert as many line breaks as needed so it fits a given width
* *