Merge remote-tracking branch 'origin/master' into morosophos/server-current4

diff --cc _hud_common.cfg
Simple merge

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/_mod.inc
Simple merge

diff --cc qcsrc/client/hud/panel/_mod.qh
Simple merge

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge

diff --cc qcsrc/common/stats.qh
index 2c4cb00d6b8bb2910eb3dada42ee0c2dc06c8057,2b293dbc13afbd82f052ff2df33c3f711d968aa4..5a25e437d9daa060b67b4e0bb87ae5488da5e794
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -356,13 -355,9 +355,13 @@@ REGISTER_STAT(SPECTATORSPEED, FLOAT
  #ifdef SVQC
  bool autocvar_sv_slick_applygravity;
  #endif
- REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity)
+ REGISTER_STAT(SLICK_APPLYGRAVITY, BOOL, autocvar_sv_slick_applygravity)
  
- REGISTER_STAT(Q3COMPAT, int, q3compat)
- REGISTER_STAT(Q3COMPAT_JUMPPADS, int, autocvar_sv_q3compat_jumppads)
 +#ifdef SVQC
 +int autocvar_sv_q3compat_jumppads;
 +#endif
+ REGISTER_STAT(Q3COMPAT, INT, q3compat)
++REGISTER_STAT(Q3COMPAT_JUMPPADS, INT, autocvar_sv_q3compat_jumppads)
  // FIXME: workaround for https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2812
  #ifdef SVQC
        #define Q3COMPAT_COMMON q3compat

diff --cc qcsrc/server/_mod.inc
Simple merge

diff --cc qcsrc/server/_mod.qh
Simple merge

diff --cc qcsrc/server/damage.qc
Simple merge

diff --cc qcsrc/server/race.qc
index 955db3dd5cfb3d8ede607d8676fe2ebd523dc1a6,4cc4991bd2cf9aa5813d8a6d70926f59073ad4d3..91b473a9b3e229d9f900510da8489da86af41e71
--- 1/qcsrc/server/race.qc
--- 2/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@@ -182,7 -164,7 +183,8 @@@ float race_checkpoint_lastlaps[MAX_CHEC
  entity race_checkpoint_lastplayers[MAX_CHECKPOINTS];
  
  .float race_checkpoint_record[MAX_CHECKPOINTS];
 +.float current_checkpoint_record[MAX_CHECKPOINTS];
+ .float race_checkpoint_recordspeed[MAX_CHECKPOINTS];
  
  float race_highest_checkpoint;
  float race_timed_checkpoint;
@@@ -848,12 -813,7 +870,12 @@@ void checkpoint_passed(entity this, ent
                        player.race_movetime = player.race_movetime_frac = player.race_movetime_count = 0;
                        player.race_penalty_accumulator = 0;
                        player.race_lastpenalty = NULL;
 -              }
 +                for (int i=0; i < MAX_CHECKPOINTS; i++) {
 +                              player.current_checkpoint_record[i] = 0;
 +                      }
 +              } else {
-                   player.current_checkpoint_record[this.race_checkpoint] = player.race_movetime; 
++                  player.current_checkpoint_record[this.race_checkpoint] = player.race_movetime;
 +      }
  
                if(g_race_qualifying)
                        race_SendNextCheckpoint(player, 0);