diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index 3e651ea61..e999dd6db 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -14,6 +14,7 @@ [UPDATED] Locking and unlocking safes no longer plays the medic animation. #1942 @SmokeyBR [UPDATED] Locking and unlocking safes now uses call instead of spawn on the server. This fixes the user input lock and safes appearing to disappear momentarily when server FPS is low. [UPDATED] Added cleanup of destroyed vehicles and CraterLong after 25 minutes in sched_corpses.sqf +[UPDATED] Reverted group menu color scheme to A2OA default for consistency with game dialogs [FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc [FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down. diff --git a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp index e53772387..59383bdac 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp @@ -33,6 +33,7 @@ class DZ_GroupListBox: RscListBox { arrowFull = "\ca\ui\data\ui_arrow_combo_active_ca.paa"; wholeHeight = .45; rowHeight = .04; + color[] = {.7, .7, .7, 1}; colorActive[] = {0,0,0,1}; colorDisabled[] = {0,0,0,.3}; sizeEx = .023; @@ -65,13 +66,13 @@ class DZ_GroupButton: RscButton { colorBackgroundDisabled[] = {0.1, 0.1, 0.1, 0.5}; colorShadow[] = {0.95, 0.95, 0.95, 1}; colorBorder[] = {0.95, 0.95, 0.95, 1}; - animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa"; - animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa"; - animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa"; - animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa"; - animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa"; - animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa"; - animTextureNoShortcut = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa"; + animTextureNormal = "\ca\ui\data\ui_button_normal_ca.paa"; + animTextureDisabled = "\ca\ui\data\ui_button_disabled_ca.paa"; + animTextureOver = "\ca\ui\data\ui_button_over_ca.paa"; + animTextureFocused = "\ca\ui\data\ui_button_focus_ca.paa"; + animTexturePressed = "\ca\ui\data\ui_button_down_ca.paa"; + animTextureDefault = "\ca\ui\data\ui_button_default_ca.paa"; + animTextureNoShortcut = "\ca\ui\data\ui_button_normal_ca.paa"; textureNoShortcut = ""; class HitZone { left = .002; @@ -118,7 +119,7 @@ class DZ_GroupDialog { sizeEx = .023; colorBackground[] = {}; colorText[] = {}; - text = "\z\addons\dayz_code\gui\grey\ui_background_controls_ca.paa"; + text = "\ca\ui\data\ui_background_controls_ca.paa"; moving = 0; x = .0; y = .1; @@ -126,9 +127,9 @@ class DZ_GroupDialog { h = .65; }; class Title: DZ_GroupText { - text = $STR_EPOCH_GROUPS; + text = $STR_EPOCH_GROUP_MANAGEMENT; sizeEx = .04; - x = .35; + x = .28; y = .112; w = .3; h = .05; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillCategories.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillCategories.sqf index 18759bbac..41d5d5535 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillCategories.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillCategories.sqf @@ -5,5 +5,5 @@ call Z_clearBuyList; { _index = lbAdd [Z_AT_BUYABLELIST,_x select 0]; - lbSetPicture [Z_AT_BUYABLELIST,_index,"\z\addons\dayz_code\gui\grey\arrow_right.paa"]; + lbSetPicture [Z_AT_BUYABLELIST,_index,"\z\addons\dayz_code\gui\gear\arrow_right.paa"]; } forEach Z_traderData; diff --git a/SQF/dayz_code/gui/grey/arrow_right.paa b/SQF/dayz_code/gui/gear/arrow_right.paa similarity index 100% rename from SQF/dayz_code/gui/grey/arrow_right.paa rename to SQF/dayz_code/gui/gear/arrow_right.paa diff --git a/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa b/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa deleted file mode 100644 index a2eef8cd7..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa b/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa deleted file mode 100644 index 93daf7a60..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa b/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa deleted file mode 100644 index 5d7e1a6c1..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_default_ca.paa b/SQF/dayz_code/gui/grey/igui_button_default_ca.paa deleted file mode 100644 index c1e5729ab..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_default_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa b/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa deleted file mode 100644 index cd786feb9..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_down_ca.paa b/SQF/dayz_code/gui/grey/igui_button_down_ca.paa deleted file mode 100644 index 37485609d..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_down_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa b/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa deleted file mode 100644 index 4757da44d..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa b/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa deleted file mode 100644 index c1e5729ab..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_button_over_ca.paa b/SQF/dayz_code/gui/grey/igui_button_over_ca.paa deleted file mode 100644 index e007b967b..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_button_over_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa b/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa deleted file mode 100644 index 955ec7e70..000000000 Binary files a/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/loadscreen_progressbar_ca.paa b/SQF/dayz_code/gui/grey/loadscreen_progressbar_ca.paa deleted file mode 100644 index 4cd7291f8..000000000 Binary files a/SQF/dayz_code/gui/grey/loadscreen_progressbar_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_arrow_top_active_ca.paa b/SQF/dayz_code/gui/grey/ui_arrow_top_active_ca.paa deleted file mode 100644 index 25182252a..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_arrow_top_active_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_arrow_top_ca.paa b/SQF/dayz_code/gui/grey/ui_arrow_top_ca.paa deleted file mode 100644 index 498b900fc..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_arrow_top_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_audio_background_ca.paa b/SQF/dayz_code/gui/grey/ui_audio_background_ca.paa deleted file mode 100644 index a67d6dbab..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_audio_background_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_controlers_ca.paa b/SQF/dayz_code/gui/grey/ui_background_controlers_ca.paa deleted file mode 100644 index 722158f69..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_controlers_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_controls_ca.paa b/SQF/dayz_code/gui/grey/ui_background_controls_ca.paa deleted file mode 100644 index d4688010f..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_controls_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_messagebox_ca.paa b/SQF/dayz_code/gui/grey/ui_background_messagebox_ca.paa deleted file mode 100644 index 2b99f5dc1..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_messagebox_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_modlauncher_ca.paa b/SQF/dayz_code/gui/grey/ui_background_modlauncher_ca.paa deleted file mode 100644 index 62380658e..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_modlauncher_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_mp_pause_ca.paa b/SQF/dayz_code/gui/grey/ui_background_mp_pause_ca.paa deleted file mode 100644 index a0d3621b8..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_mp_pause_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_profile_ca.paa b/SQF/dayz_code/gui/grey/ui_background_profile_ca.paa deleted file mode 100644 index cbf092119..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_profile_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_video_buttons_ca.paa b/SQF/dayz_code/gui/grey/ui_background_video_buttons_ca.paa deleted file mode 100644 index 3ad8eb3eb..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_video_buttons_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_background_video_ca.paa b/SQF/dayz_code/gui/grey/ui_background_video_ca.paa deleted file mode 100644 index a92b705eb..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_background_video_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_border_scroll_ca.paa b/SQF/dayz_code/gui/grey/ui_border_scroll_ca.paa deleted file mode 100644 index a3208d2cc..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_border_scroll_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_default_ca.paa b/SQF/dayz_code/gui/grey/ui_button_default_ca.paa deleted file mode 100644 index 704e099d2..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_default_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_disabled_ca.paa b/SQF/dayz_code/gui/grey/ui_button_disabled_ca.paa deleted file mode 100644 index 35610d6a6..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_disabled_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_down_ca.paa b/SQF/dayz_code/gui/grey/ui_button_down_ca.paa deleted file mode 100644 index 2fdd1ca8f..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_down_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_focus_ca.paa b/SQF/dayz_code/gui/grey/ui_button_focus_ca.paa deleted file mode 100644 index 30904aeb4..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_focus_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_main_disabled_ca.paa b/SQF/dayz_code/gui/grey/ui_button_main_disabled_ca.paa deleted file mode 100644 index 2c52569d7..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_main_disabled_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_main_down_ca.paa b/SQF/dayz_code/gui/grey/ui_button_main_down_ca.paa deleted file mode 100644 index b38d4030f..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_main_down_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_main_focus_ca.paa b/SQF/dayz_code/gui/grey/ui_button_main_focus_ca.paa deleted file mode 100644 index a6f291b41..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_main_focus_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_main_normal_ca.paa b/SQF/dayz_code/gui/grey/ui_button_main_normal_ca.paa deleted file mode 100644 index b7755cb22..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_main_normal_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_main_over_ca.paa b/SQF/dayz_code/gui/grey/ui_button_main_over_ca.paa deleted file mode 100644 index bd173402e..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_main_over_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_normal_ca.paa b/SQF/dayz_code/gui/grey/ui_button_normal_ca.paa deleted file mode 100644 index 704e099d2..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_normal_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_button_over_ca.paa b/SQF/dayz_code/gui/grey/ui_button_over_ca.paa deleted file mode 100644 index 4b678fe38..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_button_over_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_gameoptions_background_ca.paa b/SQF/dayz_code/gui/grey/ui_gameoptions_background_ca.paa deleted file mode 100644 index 05a929213..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_gameoptions_background_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_mainmenu_background_ca.paa b/SQF/dayz_code/gui/grey/ui_mainmenu_background_ca.paa deleted file mode 100644 index 8bec0b0c5..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_mainmenu_background_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_mainmenu_background_small_ca.paa b/SQF/dayz_code/gui/grey/ui_mainmenu_background_small_ca.paa deleted file mode 100644 index 48cec343c..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_mainmenu_background_small_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_messagebox_bottom_ca.paa b/SQF/dayz_code/gui/grey/ui_messagebox_bottom_ca.paa deleted file mode 100644 index 13ffc8824..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_messagebox_bottom_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_messagebox_middle_ca.paa b/SQF/dayz_code/gui/grey/ui_messagebox_middle_ca.paa deleted file mode 100644 index 18ae8f6a3..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_messagebox_middle_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_messagebox_top_ca.paa b/SQF/dayz_code/gui/grey/ui_messagebox_top_ca.paa deleted file mode 100644 index 1395c375b..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_messagebox_top_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_newprofile_background_ca.paa b/SQF/dayz_code/gui/grey/ui_newprofile_background_ca.paa deleted file mode 100644 index 49c8ecc18..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_newprofile_background_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_revert_background_ca.paa b/SQF/dayz_code/gui/grey/ui_revert_background_ca.paa deleted file mode 100644 index 0869d1e51..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_revert_background_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/gui/grey/ui_scrollbar_thumb_ca.paa b/SQF/dayz_code/gui/grey/ui_scrollbar_thumb_ca.paa deleted file mode 100644 index 4a1f54f95..000000000 Binary files a/SQF/dayz_code/gui/grey/ui_scrollbar_thumb_ca.paa and /dev/null differ diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3ed75b665..a589c6397 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -16351,10 +16351,8 @@ Группы (F5) Gruppen (F5) - - Groups - Группы - Gruppen + + Group Management My Group