Merge branch 'des/racetimer_speed' into des/racesplits_panel

diff --cc qcsrc/client/main.qh
index f3afcdf747a9dc63fcacf691a8e16fe048b8c0ca,66d10cdae2a5c56cf4c46417cc6c16688953943a..82349dda6d9c7eb57bc8a9592840f8e277721376
--- 1/qcsrc/client/main.qh
--- 2/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@@ -26,7 -27,8 +26,7 @@@ bool autocvar_cl_race_cptimes_showspee
  bool autocvar_cl_race_cptimes_showspeed_unit = true;
  #else
  AUTOCVAR_SAVE(cl_race_checkpoint_splits_console, bool, 1, "Print checkpoint splits to console");
- AUTOCVAR_SAVE(cl_race_cptimes_showspeed, bool, 0, "Show race checkpoint speed");
 -AUTOCVAR_SAVE(cl_race_checkpoint_splits_hud, bool, 1, "Show race checkpoint splits on HUD in infomessages");
+ AUTOCVAR_SAVE(cl_race_cptimes_showspeed, bool, 0, "Show race checkpoint speed (NOTE: ignores vertical speed)");
  AUTOCVAR_SAVE(cl_race_cptimes_showspeed_unit, bool, 1, "Show race checkpoint speed units");
  #endif
  bool autocvar_cl_race_cptimes_onlyself; // TODO: move to race gamemode

diff --cc xonotic-client.cfg
index e33237b0da0ce1594f93941e3db1623a23d97443,0dca1983bafda5cb944b9369fdad5305a7ce072b..f651b875130bf547e3a8c2c82008e4609ee65c56
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -715,8 -715,9 +715,8 @@@ seta cl_jetpack_jump 1 "Activate jetpac
  seta cl_race_cptimes_showself 1 "Always show your own times as well as the current best on checkpoints in Race/CTS"
  seta cl_race_cptimes_onlyself 0 "Only show your own times on checkpoints in Race/CTS. Can be forced on by the server via g_race_cptimes_onlyself"
  seta cl_race_cptimes_showspeed 0 "Show race checkpoint speed"
- seta cl_race_cptimes_showspeed_unit 1 "Show race checkpoint speed units"
+ seta cl_race_cptimes_showspeed_unit 1 "Show race checkpoint speed units (NOTE: ignores vertical speed)"
  seta cl_race_checkpoint_splits_console 1 "Print checkpoint splits to console"
 -seta cl_race_checkpoint_splits_hud 1 "Show race checkpoint splits on HUD in infomessages"
  
  seta cl_cts_noautoswitch 0 "Prevent forced switching to new weapons in CTS"