Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings to toggle attributes #716

Merged
merged 14 commits into from
May 21, 2023
Merged

Add settings to toggle attributes #716

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
662fec2
add settings
ampersand38 Mar 16, 2023
6bb8c52
Merge remote-tracking branch 'upstream/master' into toggle-attributes…
ampersand38 Apr 2, 2023
d90f1c2
German translation
Kexanone Apr 17, 2023
140012c
Merge remote-tracking branch 'upstream/master' into toggle-attributes…
ampersand38 Apr 28, 2023
5d1bd38
object and group attributes, settings page
ampersand38 Apr 28, 2023
9c4fc44
remove Original
ampersand38 Apr 28, 2023
709154b
fixed indent
ampersand38 Apr 28, 2023
a8883ae
remove waypoint
ampersand38 Apr 28, 2023
1d59cd5
enableExecute
ampersand38 Apr 28, 2023
dee82e0
removed tooltips
ampersand38 May 20, 2023
bf49779
remote tooltip
ampersand38 May 20, 2023
f5274f0
waypoints
ampersand38 May 20, 2023
18cce2e
Add remaining attributes
mharis001 May 21, 2023
92bbe3d
Use EGVAR
mharis001 May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/attributes/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ GVAR(previousMarkerColors) = [] call CBA_fnc_createNamespace;

// Initialize the core/default attributes
#include "initAttributes.sqf"
#include "initSettings.sqf"

ADDON = true;
8 changes: 4 additions & 4 deletions addons/attributes/initAttributes.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
} forEach call EFUNC(common,getSelectedUnits);
},
{rank _entity},
{alive _entity && {_entity isKindOf "CAManBase"}}
{GVAR(enableRank) && {alive _entity && {_entity isKindOf "CAManBase"}}}
] call FUNC(addAttribute);

[
Expand Down Expand Up @@ -140,7 +140,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{locked _entity},
{alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
{GVAR(enableVehicleLock) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand Down Expand Up @@ -249,7 +249,7 @@
{
_entity getVariable [QGVAR(respawnPos), []] param [0, sideEmpty]
},
{alive _entity && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}}
{GVAR(enableRespawn) && {alive _entity} && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}}
] call FUNC(addAttribute);

[
Expand Down Expand Up @@ -298,7 +298,7 @@

_respawnID
},
{_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}
{GVAR(enableRespawn) && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand Down
26 changes: 26 additions & 0 deletions addons/attributes/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
QGVAR(enableRank),
"CHECKBOX",
["str_3den_object_attribute_rank_displayname", LSTRING(EnableAttribute_Description)],
[ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"],
true,
false
] call CBA_fnc_addSetting;

[
QGVAR(enableVehicleLock),
"CHECKBOX",
["str_3den_object_attribute_lock_displayname", LSTRING(EnableAttribute_Description)],
[ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"],
true,
false
] call CBA_fnc_addSetting;

[
QGVAR(enableRespawn),
"CHECKBOX",
["str_3den_multiplayer_attributecategory_respawn_displayname", LSTRING(EnableAttribute_Description)],
[ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"],
true,
false
] call CBA_fnc_addSetting;
4 changes: 4 additions & 0 deletions addons/attributes/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,5 +368,9 @@
<Chinese>打開所選實體的Zeus屬性顯示。當選擇多個實體時（即由於選擇了一個小組），將使用懸停的實體。</Chinese>
<Italian>Apre la visualizzazione degli attributi di Zeus per l'entità selezionata.\nQuando vengono selezionate più entità (ad es. a causa della selezione di un gruppo), verrà utilizzata l'entità al passaggio del mouse.</Italian>
</Key>
<Key ID="STR_ZEN_Attributes_EnableAttribute_Description">
<English>Enables the related attribute(s) in the Zeus attributes display</English>
<German>Zeigt die entsprechende Eigentschaft(en) im Eigenschaftsfenster an.</German>
</Key>
</Package>
</Project>