Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/client/view.qc
#	qcsrc/common/weapons/weapon/tuba.qc

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

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

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

diff --cc qcsrc/common/weapons/weapon/hagar.qc
index aa564565bb2c7cf591bdb298a2bdbeab66ad23a9,684ee75d377540a15de2911269dbf6ccf078d982..eff656a6e1dce2ae5f271c4de27c454a6a654dc7
--- 1/qcsrc/common/weapons/weapon/hagar.qc
--- 2/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@@ -316,10 -313,10 +316,10 @@@ void W_Hagar_Attack2_Load(Weapon thiswe
  {
        // loadable hagar secondary attack, must always run each frame
  
-       if(time < game_starttime || PS(actor).m_switchweapon != WEP_HAGAR)
+       if(time < game_starttime)
                return;
  
 -      bool loaded = actor.hagar_load >= WEP_CVAR_SEC(hagar, load_max);
 +      bool loaded = actor.(weaponentity).hagar_load >= WEP_CVAR_SEC(hagar, load_max);
  
        // this is different than WR_CHECKAMMO when it comes to reloading
        bool enough_ammo;

diff --cc qcsrc/common/weapons/weapon/tuba.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/g_hook.qc
Simple merge

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

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

diff --cc qcsrc/server/weapons/selection.qc
Simple merge

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge