Merge branch 'master' into divVerent/csqcmodel

Conflicts:
	qcsrc/server/cl_client.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/progs.src
Simple merge

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

diff --cc qcsrc/server/cl_client.qc
index a113416fc0184dedaaaf5fe2bd70833fdf3dbd2d,40039ead81f107743a38a78b3a58be2ea38ba6cd..8c6b5db62592a42eab93c89e0f2993e6b148fc2e
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1674,15 -1810,7 +1687,17 @@@ void ClientConnect (void
        if(!autocvar_g_campaign)
                Send_CSQC_Centerprint_Generic(self, CPID_MOTD, getwelcomemessage(), autocvar_welcome_message_time, 0);
  
 +#ifndef NO_LEGACY_NETWORKING
 +      if(autocvar_sv_use_csqc_players)
 +      {
 +              CSQCModel_LinkEntity();
 +              self.iscsqcmodel = 1;
 +      }
 +#else
 +      CSQCModel_LinkEntity();
 +#endif
++
+       self.model_randomizer = random();
  }
  
  /*

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

diff --cc qcsrc/server/progs.src
Simple merge