Merge branch 'master' into terencehill/glowmod_color_fix

diff --cc qcsrc/client/csqcmodel_hooks.qc
index 95bf3c91f8d7699aada0dec777aa3a7bee08e456,99456bd3ed03d129d2fb2ffc741e380e612f66ec..41217ca4cc5e233425a4c50e730d859a137339e4
--- 1/qcsrc/client/csqcmodel_hooks.qc
--- 2/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -284,9 -282,16 +282,16 @@@ void CSQCPlayer_ModelAppearance_Apply(e
  
        LABEL(skipforcemodels)
  
+       if((this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) && !autocvar_cl_respawn_ghosts_keepcolors)
+       {
+               this.glowmod = '0 0 0';
+               this.colormap = 0;
+               return;
+       }
+ 
        // GLOWMOD AND DEATH FADING
        if(this.colormap > 0)
 -              this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2;
 +              this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true);
        else
                this.glowmod = '1 1 1';
  

diff --cc qcsrc/client/weapons/projectile.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qh
Simple merge