Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/client/view.qc

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

diff --cc qcsrc/client/view.qc
index 9c19493dced8d4a72e34053237c816449e44335e,c85d075a668f34bb33009d55d16ffb0cff18d7a0..b98e5df0fce34fbdf7e09164196cf87ceb64e4c6
--- 1/qcsrc/client/view.qc
--- 2/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@@ -314,17 -312,15 +314,14 @@@ void viewmodel_draw(entity this
                CSQCModel_Effects_Apply(e);
        }
        {
 -              static string name_last;
                string name = wep.mdl;
-               if(wep == WEP_TUBA)
-               {
-                       name = (this.tuba_instrument == 0) ? "tuba" :
-                          (this.tuba_instrument == 1) ? "akordeon" :
-                                                    "kleinbottle";
-               }
+               string newname = wep.wr_viewmodel(wep, this);
+               if(newname)
+                       name = newname;
 -              bool swap = name != name_last;
 +              bool swap = name != this.name_last;
                // if (swap)
                {
 -                      name_last = name;
 +                      this.name_last = name;
                        CL_WeaponEntity_SetModel(this, name, swap);
                        this.viewmodel_origin = this.origin;
                        this.viewmodel_angles = this.angles;

diff --cc qcsrc/common/_all.inc
Simple merge

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

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

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

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

diff --cc qcsrc/common/weapons/weapon.qh
index 782f3c5cedcbf414c98c6712ce8e21ba44063044,b287b148f3175727cebf8fa1e44a288099ae8e2b..c873f4463302337faf73b3e29ddbba2471b9bf15
--- 1/qcsrc/common/weapons/weapon.qh
--- 2/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@@ -119,12 -117,14 +119,14 @@@ CLASS(Weapon, Object
          // no weapon specific image for this weapon
          return false;
      }
+     /** (CLIENT) weapon specific view model */
+     METHOD(Weapon, wr_viewmodel, string(Weapon this, entity wep)) { return string_null; }
      /** (CLIENT) weapon specific glow */
 -    METHOD(Weapon, wr_glow, vector(Weapon this, entity actor)) { return '0 0 0'; }
 +    METHOD(Weapon, wr_glow, vector(Weapon this, entity actor, entity wepent)) { return '0 0 0'; }
      /** (SERVER) the weapon is dropped */
 -    METHOD(Weapon, wr_drop, void(Weapon this, entity actor)) {}
 +    METHOD(Weapon, wr_drop, void(Weapon this, entity actor, .entity weaponentity)) {}
      /** (SERVER) a weapon is picked up */
 -    METHOD(Weapon, wr_pickup, void(Weapon this, entity actor)) {}
 +    METHOD(Weapon, wr_pickup, void(Weapon this, entity actor, .entity weaponentity)) {}
      /** (SERVER) update cvar based properties */
      METHOD(Weapon, wr_update, void(Weapon this)) {}
        METHOD(Weapon, display, void(entity this, void(string name, string icon) returns)) {

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