From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 1 Jul 2022 02:46:41 +0000 (+0200)
Subject: Merge branch 'master' into Juhu/strafehud-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=957bfab27526810ed839b74177cd35e0f186d194;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Juhu/strafehud-server
---

957bfab27526810ed839b74177cd35e0f186d194
diff --cc qcsrc/client/hud/panel/strafehud.qc
index d61039692,e4e339c44..d656d8a00
--- a/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@@ -11,17 -10,9 +10,18 @@@
  #include <common/mapinfo.qh>
  #include <common/physics/movetypes/movetypes.qh>
  #include <common/physics/player.qh>
+ #include <common/resources/cl_resources.qh>
  #include <lib/csqcmodel/cl_player.qh>
  
 +AUTOCVAR_SAVE(hud_panel_strafehud_pos, string, "0.320000 0.570000", "position of this base of the panel");
 +AUTOCVAR_SAVE(hud_panel_strafehud_size, string, "0.360000 0.020000", "size of this panel");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg, string, "0", "if set to something else than \"\" = override default background");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_color, string, "", "if set to something else than \"\" = override default panel background color");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_color_team, string, "", "override panel color with team color in team based games");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_alpha, string, "0.7", "if set to something else than \"\" = override default panel background alpha");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_border, string, "", "if set to something else than \"\" = override default size of border around the background");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_padding, string, "", "if set to something else than \"\" = override default padding of contents from border");
 +
  // StrafeHUD (#25)
  
  void HUD_StrafeHUD_Export(int fh)