Merge branch 'master' into Mario/sound_model_paths

# Conflicts:
#	qcsrc/common/items/item/powerup.qc

diff --cc qcsrc/common/items/item/armor.qc
Simple merge

diff --cc qcsrc/common/items/item/health.qc
Simple merge

diff --cc qcsrc/common/items/item/jetpack.qc
index b45e1c18e18a08bf13759964bdebf68922da9018,dcc16b6e42b83e7225cc8386b9553a3966533c66..3b4cfbc141c9a6b1798612f7b8ef7238162f20eb
--- 1/qcsrc/common/items/item/jetpack.qc
--- 2/qcsrc/common/items/item/jetpack.qc
+++ b/qcsrc/common/items/item/jetpack.qc
@@@ -7,9 -7,12 +7,12 @@@
  #include "powerup.qh"
  
  REGISTER_ITEM(Jetpack, Powerup) {
 -    this.m_model                =   "models/items/g_jetpack.md3";
 +    this.m_model                =   "g_jetpack.md3";
      this.m_name                 =   "Jet pack";
      this.m_icon                 =   "jetpack";
+     this.m_color                =   '0.5 0.5 0.5';
+     this.m_waypoint             =   _("Jet Pack");
+     this.m_waypointblink        =   2;
  #ifdef SVQC
      this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
      this.m_itemid               =   IT_JETPACK;
@@@ -28,9 -31,12 +31,12 @@@ REGISTER_ITEM(JetpackFuel, Ammo) 
  }
  
  REGISTER_ITEM(JetpackRegen, Pickup) {
 -    this.m_model                =   "models/items/g_fuelregen.md3";
 +    this.m_model                =   "g_fuelregen.md3";
      this.m_name                 =   "Fuel regenerator";
      this.m_icon                 =   "fuelregen";
+     this.m_color                =   '1 0.5 0';
+     this.m_waypoint             =   _("Fuel regen");
+     this.m_waypointblink        =   2;
  #ifdef SVQC
      this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
      this.m_itemflags            =   FL_POWERUP;

diff --cc qcsrc/common/items/item/powerup.qc
index bc4ff8ddd859878ca5e8ad9cd244d9082009dd26,6d38d63748ade1574275618e675de84eed34af17..fcfe2afb93a5a7c4b44183dfd6c654595f9c1c77
--- 1/qcsrc/common/items/item/powerup.qc
--- 2/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@@ -5,16 -5,22 +5,22 @@@
  .int m_itemid;
  #endif
  REGISTER_ITEM(Strength, Powerup) {
-     this.m_model    =   "g_strength.md3";
-     this.m_sound    =   "misc/powerup.wav";
-     this.m_name     =   "Strength Powerup";
-     this.m_icon     =   "strength";
-     this.m_itemid   =   IT_STRENGTH;
 -    this.m_model            =   "models/items/g_strength.md3";
++    this.m_model            =   "g_strength.md3";
+     this.m_sound            =   "misc/powerup.wav";
+     this.m_name             =   "Strength Powerup";
+     this.m_icon             =   "strength";
+     this.m_color            =   '0 0 1';
+     this.m_waypoint         =   _("Strength");
+     this.m_waypointblink    =   2;
+     this.m_itemid           =   IT_STRENGTH;
  }
  REGISTER_ITEM(Shield, Powerup) {
-     this.m_model    =   "g_invincible.md3";
-     this.m_sound    =   "misc/powerup_shield.wav";
-     this.m_name     =   "Shield";
-     this.m_icon     =   "shield";
-     this.m_itemid   =   IT_INVINCIBLE;
 -    this.m_model            =   "models/items/g_invincible.md3";
++    this.m_model            =   "g_invincible.md3";
+     this.m_sound            =   "misc/powerup_shield.wav";
+     this.m_name             =   "Shield";
+     this.m_icon             =   "shield";
+     this.m_color            =   '1 0 1';
+     this.m_waypoint         =   _("Shield");
+     this.m_waypointblink    =   2;
+     this.m_itemid           =   IT_INVINCIBLE;
  }

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