Merge branch 'master' into Mario/wepent_experimental

diff --cc qcsrc/common/physics/player.qc
Simple merge

diff --cc qcsrc/common/vehicles/sv_vehicles.qc
index 491962b67a5f74d14f193375de0cc4c49c7022e9,9c8d05ce4e0fef38a8ecd06999c923f290d69804..1bbc18d9c21eb448546897752b1d59b2b398fa37
--- 1/qcsrc/common/vehicles/sv_vehicles.qc
--- 2/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@@ -803,15 -804,10 +804,15 @@@ void vehicles_exit(entity vehic, bool e
                player.alpha                    = 1;
                player.PlayerPhysplug   = func_null;
                player.vehicle                  = NULL;
-               player.view_ofs         = STAT(PL_VIEW_OFS, NULL);
+               player.view_ofs         = STAT(PL_VIEW_OFS, player);
                player.event_damage     = PlayerDamage;
                player.hud                              = HUD_NORMAL;
 -              PS(player).m_switchweapon = vehic.m_switchweapon;
 +              for(int slot = 0; slot < MAX_WEAPONSLOTS; ++ slot)
 +              {
 +                      .entity weaponentity = weaponentities[slot];
 +                      player.(weaponentity).m_switchweapon = vehic.(weaponentity).m_switchweapon;
 +                      delete(vehic.(weaponentity)); // no longer needed
 +              }
                player.last_vehiclecheck = time + 3;
                player.vehicle_enter_delay = time + 2;
  

diff --cc qcsrc/common/vehicles/vehicle/bumblebee.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/porto.qc
Simple merge

diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge

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

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

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