Merge branch 'master' into mirceakitsune/damage_effects

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index 1328147c77eed637ff7d585780a07613c616cbdf,bac1fdaef9c2719bf3c0438f6f5af51e1aeec43a..211191bc738640f93356ea2a99622c0ab2ef592f
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -945,9 -977,9 +977,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_DAMAGEEFFECT: Ent_DamageEffect(); 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/autocvars.qh
Simple merge

diff --cc qcsrc/common/constants.qh
index 96757d25732a21a7c28758843d88af80fef629be,507cff85abcdb2780ee6af7054a6500d5f9f18d6..6d8591237993c863ad55f2bbf3153f1f5df5a3da
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -114,8 -114,8 +114,9 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
- const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
- const float ENT_CLIENT_DAMAGEEFFECT = 32;
+ const float ENT_CLIENT_SHOWNAMES = 31;
+ const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
++const float ENT_CLIENT_DAMAGEEFFECT = 33;
  
  const float ENT_CLIENT_TURRET = 40;
  

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