From: Jeremy Potter <gitlab@stormdesign.us>
Date: Sun, 19 Apr 2020 00:22:37 +0000 (+0000)
Subject: Merge branch 'master' into 'jwinnie/bold-frag-message'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bff432ddd5dc3f8d33cb7266b33de6f54c54162;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into 'jwinnie/bold-frag-message'

# Conflicts:
#   qcsrc/client/autocvars.qh
---

0bff432ddd5dc3f8d33cb7266b33de6f54c54162
diff --cc qcsrc/client/autocvars.qh
index 992ba487b,4c6696cde..452ad3dc4
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -242,10 -242,8 +242,10 @@@ float autocvar_hud_panel_centerprint_fa
  float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75;
  float autocvar_hud_panel_centerprint_fade_minfontsize = 0;
  bool autocvar_hud_panel_centerprint_flip;
 +bool autocvar_hud_panel_centerprint_fragmessage_bold;
 +bool autocvar_hud_panel_centerprint_fragmessage_capitalize;
  float autocvar_hud_panel_centerprint_fontscale;
- float autocvar_hud_panel_centerprint_fragmessage_fontscale;
 -float autocvar_hud_panel_centerprint_fontscale_bold = 1.8;
++float autocvar_hud_panel_centerprint_fragmessage_fontscale = 1.8;
  float autocvar_hud_panel_centerprint_time;
  bool autocvar_hud_panel_chat;
  bool autocvar_hud_panel_engineinfo;