Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
	qcsrc/client/Main.qc
	qcsrc/common/constants.qh

diff --cc qcsrc/client/Main.qc
index 8e0689f000e12379955acbbaef29834c8f5a3ea6,ecc2000d7ccae32447fa4e78e75460a26e8f1f5a..9843033a1df20e49011c8852d22fb5fbd3ed1f14
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -806,7 -781,7 +809,9 @@@ void CSQC_Ent_Update(float bIsNewEntity
                case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
                case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;  
                case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
 +              case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
+               case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
++
                default:
                        //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));

diff --cc qcsrc/common/constants.qh
index 44c8c1442117ad98b29566e8ea903b70da3d7caf,ffec62095b9b9466ffcf5db66a75251f254a18f5..a54a28456361fc2c67443521990b2fd29811284a
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -99,7 -95,7 +95,8 @@@ const float ENT_CLIENT_WARPZONE_TELEPOR
  const float ENT_CLIENT_MODEL = 33;
  const float ENT_CLIENT_ITEM = 34;
  const float ENT_CLIENT_BUMBLE_RAYGUN = 35;
 -const float ENT_CLIENT_NOTIFICATION = 36;
 +const float ENT_CLIENT_SPAWNPOINT = 36;
++const float ENT_CLIENT_NOTIFICATION = 37;
  
  const float ENT_CLIENT_TURRET = 40;
  const float ENT_CLIENT_AUXILIARYXHAIR = 50;

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

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

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