Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index 3fe3bf2c2c836b05b6148ae572a2a94a9061877f,ddace6382ac4a0db186730d120af9303fcfde33d..03cbd528a2cf3cbf983ef500bc57edcaf3addee3
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -943,9 -1020,9 +991,10 @@@ void(float bIsNewEntity) CSQC_Ent_Updat
                case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
                case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
+               case ENT_CLIENT_SHOWNAMES: Ent_ShowNames(); break;
                default:
 -                      error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
 +                      //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
 +                      error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
                        break;
        }
  

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/main.qh
Simple merge

diff --cc qcsrc/common/constants.qh
index b6e928f610ed8ec0ec86c5853f7e8e40358af2ae,53eb9eed355449cf322fbea12ec43ee937e43afb..507cff85abcdb2780ee6af7054a6500d5f9f18d6
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -629,9 -634,7 +636,8 @@@ float WR_RELOAD         = 9; // (SVQC) 
  float WR_RESETPLAYER    = 10; // (SVQC) does not need to do anything
  float WR_IMPACTEFFECT = 11; // (CSQC) impact effect
  float WR_SWITCHABLE   = 12; // (CSQC) impact effect
 +float WR_PLAYERDEATH    = 13; // (SVQC) does not need to do anything
  
- 
  float HUD_PANEL_WEAPONS               = 0;
  float HUD_PANEL_AMMO          = 1;
  float HUD_PANEL_POWERUPS      = 2;

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

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

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

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

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