Merge branch 'master' into Mario/weapons_new

Conflicts:
	qcsrc/client/View.qc
	qcsrc/common/stats.qh
	qcsrc/server/mutators/mutator_instagib.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 8a5fff1714c7f81ffd529432a6263ec288fb58ad,166ea07f0903e287d9785c21fe3a443d0087f03e..1e2c7b770147e88bde914b38b0693545b4f24262
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -375,10 -374,12 +375,12 @@@ entity nightvision_noise, nightvision_n
  
  #define MAX_TIME_DIFF 5
  float pickup_crosshair_time, pickup_crosshair_size;
- float hit_time, typehit_time;
- float nextsound_hit_time, nextsound_typehit_time;
- float hitindication_crosshair_time, hitindication_crosshair_size;
+ float hitsound_time_prev;
+ float spectatee_status_prev; // for preventing hitsound when switching spectatee
+ float damage_dealt_total, damage_dealt_total_prev;
+ float typehit_time, typehit_time_prev;
+ float hitindication_crosshair_size;
 -float use_nex_chargepool;
 +float use_vortex_chargepool;
  
  float myhealth, myhealth_prev;
  float myhealth_flash;

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

diff --cc qcsrc/common/stats.qh
index 4b57447a3941a5484f0ac4df8e77726140286052,f358069e21c2c4bd2fc03dddb3ea7b1acc9f97e0..d92977f2c5bf4ebe9878adb42be50f40d8caaba0
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -52,11 -52,11 +52,11 @@@ const float STAT_SHOTOR
  const float STAT_LEADLIMIT              = 47;
  const float STAT_WEAPON_CLIPLOAD        = 48;
  const float STAT_WEAPON_CLIPSIZE        = 49;
 -const float STAT_NEX_CHARGE             = 50;
 +const float STAT_VORTEX_CHARGE          = 50;
  const float STAT_LAST_PICKUP            = 51;
  const float STAT_HUD                    = 52;
 -const float STAT_NEX_CHARGEPOOL         = 53;
 +const float STAT_VORTEX_CHARGEPOOL      = 53;
- const float STAT_HIT_TIME               = 54;
+ const float STAT_DAMAGE_DEALT_TOTAL     = 54;
  const float STAT_TYPEHIT_TIME           = 55;
  const float STAT_LAYED_MINES            = 56;
  const float STAT_HAGAR_LOAD             = 57;

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

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

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

diff --cc qcsrc/server/mutators/mutator_instagib.qc
index 4507e23c42f77900d03a17d2463bb1caf6b6bed9,bd61023a1ed3f1605f39c0c055e4551502294589..dc822e2749e8e879fb2dc6ddd4e3a547d6871092
--- 1/qcsrc/server/mutators/mutator_instagib.qc
--- 2/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -245,25 -245,28 +245,25 @@@ MUTATOR_HOOKFUNCTION(instagib_PlayerDam
                }
  
                if(IS_PLAYER(frag_attacker))
 -              if(DEATH_ISWEAPON(frag_deathtype, WEP_MINSTANEX))
 -              if(frag_target.armorvalue)
 +              if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
                {
 -                      frag_target.armorvalue -= 1;
 -                      Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
 -                      frag_damage = 0;
 -                      frag_target.damage_dealt += 1;
 -                      frag_attacker.damage_dealt += 1; // TODO change this to a future specific hitsound for armor hit
 -              }
 -
 -              if(IS_PLAYER(frag_attacker))
 -              if (DEATH_ISWEAPON(frag_deathtype, WEP_LASER))
 -              {
 -                      frag_damage = 0;
 -                      frag_mirrordamage = 0;
 -                      if (frag_target != frag_attacker)
 +                      if(frag_deathtype & HITTYPE_SECONDARY)
 +                      {
 +                              frag_damage = frag_mirrordamage = 0;
 +                              
 +                              if(frag_target != frag_attacker)
 +                              {
 +                                      if(frag_target.health > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY); }
 +                                      frag_force = '0 0 0';
 +                              }
 +                      }
 +                      else if(frag_target.armorvalue)
                        {
 -                              if (frag_target.health >= 1)
 -                                      Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY);
 -                              frag_force = '0 0 0';
 -                              // keep mirrorfrag_force
 -                              //frag_attacker = frag_target;
 +                              frag_target.armorvalue -= 1;
 +                              frag_damage = 0;
-                               frag_target.hitsound += 1;
-                               frag_attacker.hitsound += 1; // TODO: change this to a specific hitsound for armor hit
++                              frag_target.damage_dealt += 1;
++                              frag_attacker.damage_dealt += 1; // TODO: change this to a specific hitsound for armor hit
 +                              Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
                        }
                }
        }