From: TimePath Date: Sun, 2 Aug 2015 10:08:07 +0000 (+1000) Subject: Merge branch 'master' into terencehill/itemstime X-Git-Tag: xonotic-v0.8.1~12^2~15 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/itemstime # Conflicts: # qcsrc/common/stats.qh --- f1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc diff --cc hud_luma.cfg index 70260c34c,36af8de67..d0614c316 --- a/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 c3b6bde34,054254c06..5d2c55672 --- a/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 48d0df4b0,192ef68d9..447fda8a2 --- a/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 701a436c7,4045cc44d..4fe2a1fd9 --- a/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 57157d825,4ec02c1b1..c3e759c4f --- a/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 160dc850e,6728107fb..b08937f62 --- a/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/common/stats.qh index ae1830569,fa5273763..dbe9a1390 --- a/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?