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

E-Pad tweaks

Browse Source 
- Added E-Pad to DynaMenu (can be disabled)
- Fix to not close E-Pad on space release
- Removed MapMarkers from Map-DynaMenu (moved into E-Pad)
This commit is contained in:
He-Man 2018-08-20 19:19:20 +02:00
parent c91b182f3d
commit 2525391f22
6 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Sources/epoch_code/customs/images/Epad.paa Normal file
View File

Binary file not shown.

2
Sources/epoch_code/gui/scripts/e_pad/EPOCH_EPad_dialog.sqf
View File

@ -157,4 +157,4 @@ if (_animate) then {
_display displayCtrl _x ctrlcommit 0.5;
} foreach [1614,1615,1714,1715];
};
ctrlSetFocus (_display displayctrl 1600);
ctrlSetFocus (_display displayctrl 1599);

4
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
View File

@ -12,7 +12,8 @@
Github:
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
*/
/*
// Moved to E-Pad
class playerMarker_on
{
condition = "!EPOCH_PlayerMarkerOn";
@ -41,3 +42,4 @@ class deathMarker_off
icon = "x\addons\a3_epoch_community\icons\skull.paa";
tooltip = "Toggle OFF death marker";
};
*/

7
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
View File

@ -269,3 +269,10 @@ class geiger_menu
tooltip = "Unmute warnings";
};
};
class Epad
{
condition = "EPOCH_EpadButtonOn";
action = "if (isnull (finddisplay 9898)) then {createdialog 'epoch_tablet_gui';};";
icon = "epoch_code\customs\images\Epad.paa";
tooltip = "E-Pad";
};

14
Sources/epoch_config/Configs/CfgEPad.hpp
View File

@ -4,7 +4,8 @@ class e_pad_config
{"EPOCH_AutoEarplug","true"},
{"EPOCH_debugMode","false"},
{"EPOCH_PlayerMarkerOn","false"},
{"EPOCH_DeathMarkerOn","false"}
{"EPOCH_DeathMarkerOn","false"},
{"EPOCH_EpadButtonOn","true"}
};
class Apps
{
@ -41,6 +42,17 @@ class e_pad_config
Tooltip = "Settings";
ToggleVar = "";
ToggleAble = "false";
class EpadButton {
ButtonText = "";
Description = "Epad Dyna";
Icon = "epoch_code\customs\images\epoch_tablet_back.paa";
color[] = {1,0,0,1};
colortoggled[] = {0,1,0,1};
action = "";
Tooltip = "Add / Remove E-Pad Button from DynaMenu (you can still open it with F10)";
ToggleVar = "EPOCH_EpadButtonOn";
ToggleAble = "true";
};
class Reset {
ButtonText = "Reset";
Description = "Reset Settings";

10
Sources/epoch_config/Configs/CfgEPad_dialogs.hpp
View File

@ -548,6 +548,16 @@ class epoch_tablet_gui
w = 0.635763 * safezoneW;
h = 0.80322 * safezoneH;
};
class Spacer: RscButtonPDATrans
{
idc = 1599;
x = 0 * safezoneW + safezoneX;
y = 0 * safezoneH + safezoneY;
w = 0 * safezoneW;
h = 0 * safezoneH;
action = "";
tooltip = "";
};
class close: RscButtonPDATrans
{
idc = 1600;