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

Changed: Replaced _scaleUI with heartbeat animations for "topRight" dynamicHUD when critical

Browse Source
This commit is contained in:
Raymix 2016-11-09 23:47:14 +00:00
parent 9e66f8e03a
commit 77f3ca71ff
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -92,8 +92,7 @@ EPOCH_currentTargetMode = _currentTargetMode;
_forceFatigue = "forceFatigue" in _criticalAttributes; _forceFatigue = "forceFatigue" in _criticalAttributes;
_forceBloodRise = "forceBloodRise" in _criticalAttributes; _forceBloodRise = "forceBloodRise" in _criticalAttributes;
}; };
[_curCtrl,0.55] call epoch_2DCtrlHeartbeat;
[_curCtrl,_critical] call _scaleUI;
// todo make this reversable or even limited to a color range. // todo make this reversable or even limited to a color range.
_color = [_playerLimitMin,_playerLimitMax,_currentVarVal,1] call EPOCH_colorRange; _color = [_playerLimitMin,_playerLimitMax,_currentVarVal,1] call EPOCH_colorRange;
_curCtrl ctrlSetTextColor _color; _curCtrl ctrlSetTextColor _color;

17
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -123,23 +123,6 @@ _fadeUI = {
}; };
_bool _bool
}; };
_scaleUI = {
params ["_ctrl","_bool"];
private _oemScale = _ctrl getVariable ["ctrl_scale", 1];
private _curScale = ctrlScale _ctrl;
if (_bool) then {
if (_curScale isEqualTo _oemScale) then {
[_ctrl, (_oemScale - 0.1), 0.5] call BIS_fnc_ctrlSetScale;
} else {
[_ctrl, _oemScale, 0.5] call BIS_fnc_ctrlSetScale;
};
} else {
if !(_curScale isEqualTo _oemScale) then {
[_ctrl, _oemScale, 0.5] call BIS_fnc_ctrlSetScale;
};
};
_bool
};
_cursorTarget = objNull; _cursorTarget = objNull;

0
Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHearbeat.sqf → Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHeartbeat.sqf
View File

2
Sources/epoch_config/Configs/CfgClientFunctions.hpp
View File

@ -196,7 +196,7 @@ class CfgClientFunctions
{ {
file = "epoch_code\gui\scripts\animations"; file = "epoch_code\gui\scripts\animations";
class 2DCtrlShake {}; class 2DCtrlShake {};
class 2DCtrlHearbeat {}; class 2DCtrlHeartbeat {};
}; };
class config class config
{ {