W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up combat icon + update changelog

Browse Source
This commit is contained in:
icomrade
2016-07-26 12:52:28 -04:00
parent 705057bedb
commit 23a5584b52
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.txt
View File

@@ -8,6 +8,7 @@
[NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade [NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade
[NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf [NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf
[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz [NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz
[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson [NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu [NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz [NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz

4
SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
View File

@@ -256,7 +256,7 @@ class RscTitles
class RscPicture_1209: RscPictureGUI class RscPicture_1209: RscPictureGUI
{ {
idc = 1209; idc = 1209;
//text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa"; //text = "\z\addons\dayz_code\gui\status\status_bg.paa";
x = "0.955313 * safezoneW + safezoneX"; x = "0.955313 * safezoneW + safezoneX";
y = "0.65 * safezoneH + safezoneY"; y = "0.65 * safezoneH + safezoneY";
w = 0.06; w = 0.06;
@@ -265,7 +265,7 @@ class RscTitles
class RscPicture_1909: RscPictureGUI class RscPicture_1909: RscPictureGUI
{ {
idc = 1909; idc = 1909;
//text = "\z\addons\dayz_code\gui\status\status_bg.paa"; //text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa";
x = "0.955313 * safezoneW + safezoneX"; x = "0.955313 * safezoneW + safezoneX";
y = "0.65 * safezoneH + safezoneY"; y = "0.65 * safezoneH + safezoneY";
w = 0.06; w = 0.06;

10
SQF/dayz_code/compile/player_updateGui.sqf
View File

@@ -33,13 +33,13 @@ _ctrlTempBorder ctrlSetTextColor [1,1,1,1];
if (DZE_VanillaUICombatIcon) then { if (DZE_VanillaUICombatIcon) then {
_combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1}; _combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1};
_ctrlCombatBorder = _display displayCtrl 1209; _ctrlCombatBorder = _display displayCtrl 1909;
_ctrlCombat = _display displayCtrl 1308; _ctrlCombat = _display displayCtrl 1308;
_ctrlCombatBG = _display displayCtrl 1909; _ctrlCombatBG = _display displayCtrl 1209;
_ctrlCombatBorder ctrlSetTextColor [1,1,1,1]; _ctrlCombatBorder ctrlSetTextColor [1,1,1,1];
_ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 0.5]; _ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 1];
_ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_CA.paa"); _ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_new_CA.paa");
_ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_ca.paa"); _ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_new_ca.paa");
_ctrlCombatBG ctrlSetText ("\z\addons\dayz_code\gui\status\status_bg.paa"); _ctrlCombatBG ctrlSetText ("\z\addons\dayz_code\gui\status\status_bg.paa");
}; };
_ctrlBlood = _display displayCtrl 1300; _ctrlBlood = _display displayCtrl 1300;

BIN
SQF/dayz_code/gui/status/status_combat_border_new_CA.paa Normal file
View File

Binary file not shown.

BIN
SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa Normal file
View File

Binary file not shown.