Merge branch 'master' into terencehill/itemstime

# Conflicts:
#	qcsrc/common/stats.qh

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc hud_luma.cfg
index 70260c34cb163294da6a7a5e0af1dc944e83130d,36af8de6758b798ca0db0fb34c15a2156bb42b33..d0614c316a966ccc09115afd87a8e4ab7c0d936f
--- 1/hud_luma.cfg
--- 2/hud_luma.cfg
+++ b/hud_luma.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "0.77 0.67 0"
  seta hud_progressbar_acceleration_color "0.2 0.65 0.93"
  seta hud_progressbar_acceleration_neg_color "0.86 0.35 0"
+ seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0"
  
 -seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 "
 +seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.005000"

diff --cc hud_luminos.cfg
index c3b6bde346901fc9086fa1ba0c6cd15fbea4efeb,054254c06b0da9593fbfa09c976c0930612dda41..5d2c556721c28da4c6983b4e3aa633e8df6a0f33
--- 1/hud_luminos.cfg
--- 2/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "1 0.75 0"
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
+ seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0"
  
 -seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 "
 +seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.010000"

diff --cc hud_luminos_minimal.cfg
index 48d0df4b0c28458b86c5d76903f297dfdb46ab65,192ef68d91f5f61cd67fd6eb2474b122d6ec97c2..447fda8a28c4e09fb3a8f13c50cc897419c2d0a9
--- 1/hud_luminos_minimal.cfg
--- 2/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "1 0.75 0"
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
+ seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0"
  
 -seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 "
 +seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.010000"

diff --cc hud_luminos_minimal_xhair.cfg
index 701a436c78549a58156e94d122c8a8bad44c98e4,4045cc44dd4efdef79955630df919c7ee55df8a3..4fe2a1fd99a018b535e0524b7c9fa0020629361a
--- 1/hud_luminos_minimal_xhair.cfg
--- 2/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "1 0.75 0"
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
+ seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0"
  
 -seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 "
 +seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.010000"

diff --cc hud_luminos_old.cfg
index 57157d8259b2c14af0852486ff8f83039d9b390c,4ec02c1b1c26afc2615949577ca07566a137754a..c3e759c4f1a15c1e2acbfd272183018070eb70ed
--- 1/hud_luminos_old.cfg
--- 2/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "1 0.75 0"
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
+ seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0"
  
 -seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 "
 +seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.010000"

diff --cc hud_nexuiz.cfg
index 160dc850e6311f66a9236dcb54cf50c59649d2eb,6728107fb104c8998a94cbf6855d37f7df0ff9dc..b08937f62cc0f0ae36eae67558a694870af08ccd
--- 1/hud_nexuiz.cfg
--- 2/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0.
  seta hud_progressbar_speed_color "1 0.75 0"
  seta hud_progressbar_acceleration_color "0.5 0.75 1"
  seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
+ seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0"
+ seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0"
  
 -seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 "
 +seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 17 "
  
  seta hud_configure_grid "1"
  seta hud_configure_grid_xsize "0.01"

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

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

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

diff --cc qcsrc/common/stats.qh
index ae1830569f43b6bfa54612d8f665defe9ec823a2,fa52737631f93bf0599097b28ae9041b71142a27..dbe9a13901a86c25ce813146c00c0ba6d64d6f0a
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -109,19 -109,19 +109,18 @@@ const int STAT_OK_AMMO_CHARGE         
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
  const int STAT_FROZEN                 = 87;
  const int STAT_REVIVE_PROGRESS        = 88;
- // 89 empty?
- const float STAT_ARMOR_LARGE_TIME       = 90;
- const float STAT_HEALTH_MEGA_TIME       = 91;
- const float STAT_INVISIBLE_TIME         = 92;
- const float STAT_SPEED_TIME             = 93;
- const float STAT_EXTRALIFE_TIME         = 94;
- const float STAT_STRENGTH_TIME          = 95;
- const float STAT_SHIELD_TIME            = 96;
- const float STAT_FUELREGEN_TIME         = 97;
- const float STAT_JETPACK_TIME           = 98;
- const float STAT_SUPERWEAPONS_TIME      = 99;
- 
 -const int STAT_WEAPONSINMAP           = 89;
 -const int STAT_WEAPONSINMAP2          = 90;
 -const int STAT_WEAPONSINMAP3          = 91;
 -// 92 empty?
 -// 93 empty?
 -// 94 empty?
 -// 95 empty?
 -// 96 empty?
 -// 97 empty?
 -// 98 empty?
++const int STAT_ARMOR_LARGE_TIME       = 89;
++const int STAT_HEALTH_MEGA_TIME       = 90;
++const int STAT_INVISIBLE_TIME         = 91;
++const int STAT_SPEED_TIME             = 92;
++const int STAT_EXTRALIFE_TIME         = 93;
++const int STAT_STRENGTH_TIME          = 94;
++const int STAT_SHIELD_TIME            = 95;
++const int STAT_FUELREGEN_TIME         = 96;
++const int STAT_JETPACK_TIME           = 97;
++const int STAT_SUPERWEAPONS_TIME      = 98;
+ // 99 empty?
  
 -
  /* The following stats change depending on the gamemode, so can share the same ID */
  // IDs 100 to 104 reserved for gamemodes
  
@@@ -171,7 -171,7 +170,9 @@@ const int STAT_PL_CROUCH_MAX3         
  const int STAT_PL_CROUCH_VIEW_OFS1    = 117;
  const int STAT_PL_CROUCH_VIEW_OFS2    = 118;
  const int STAT_PL_CROUCH_VIEW_OFS3    = 119;
--// 120 empty?
++const int STAT_WEAPONSINMAP           = 120;
++const int STAT_WEAPONSINMAP2          = 121;
++const int STAT_WEAPONSINMAP3          = 122;
  // 121 empty?
  // 122 empty?
  // 123 empty?

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

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

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