From: Nikolay S Date: Wed, 27 Nov 2024 18:09:59 +0000 (+0100) Subject: Fix merge fail X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69aca94932b9fe0067695b4501096d60a900cc3e;p=xonotic%2Fxonotic-data.pk3dir.git Fix merge fail --- diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh index fcd356874..1c8a307bd 100644 --- a/qcsrc/client/hud/panel/strafehud.qh +++ b/qcsrc/client/hud/panel/strafehud.qh @@ -32,7 +32,7 @@ AUTOCVAR_SAVE(hud_panel_strafehud_angle_overturn_color, vector, '1 0 1', "color AUTOCVAR_SAVE(hud_panel_strafehud_angle_line, int, 0, "defines the number of dashes of the indicator line showing the player's current angle (set to 0 to disable or 1 for a solid line)"); AUTOCVAR_SAVE(hud_panel_strafehud_angle_line_width, float, 0.001, "width of the indicator line showing the player's current angle (relative to the panel width)"); AUTOCVAR_SAVE(hud_panel_strafehud_angle_line_height, float, 1, "height of the indicator line showing the player's current angle (relative to the panel height)"); -AUTOCVAR_SAVE(hud_panel_strafehud_angle_arrow, int, 1, arrow style of the angle indicator showing the player's current angle (0 = none, 1 = top, 2 = bottom, 3 = both)"); +AUTOCVAR_SAVE(hud_panel_strafehud_angle_arrow, int, 1, "arrow style of the angle indicator showing the player's current angle (0 = none, 1 = top, 2 = bottom, 3 = both)"); AUTOCVAR_SAVE(hud_panel_strafehud_angle_arrow_size, float, 0.5, "arrow size of the indicator showing the player's current angle (relative to the panel height)"); AUTOCVAR_SAVE(hud_panel_strafehud_bestangle, int, 1, "set to 1 to enable a ghost angle indicator showing the best angle to gain maximum acceleration, 2 = only when side strafing"); AUTOCVAR_SAVE(hud_panel_strafehud_bestangle_color, vector, '1 1 1', "color of the indicator showing the best angle to gain maximum acceleration");