Merge branch 'master' into Mario/weaponorder

diff --combined hud_luma.cfg
index c4ef1b0c2d6605d2f224a848c94649995d5c08c1,813ecbaef0df64396789d8115bce2c758deaec4d..d8151425127d8fc80f1cd3e9d7c2250c229e06ad
--- 1/hud_luma.cfg
--- 2/hud_luma.cfg
+++ b/hud_luma.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "1"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "0.8"
  seta hud_panel_weapons_noncurrent_scale "0.9"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding "1"
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0.010000 0.700000"

diff --combined hud_luminos.cfg
index 15b9066da9c46b7b0412e0420ff9173dd189058f,c5cfe4ac548fdc62e070ac1cda9ed08d4a9c3524..8766bcb24835825fed6417263ba6b169455a38b4
--- 1/hud_luminos.cfg
--- 2/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "1"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "1"
  seta hud_panel_weapons_noncurrent_scale "1"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding ""
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0.010000 0.700000"

diff --combined hud_luminos_minimal.cfg
index eb61ca79ede9758d6a3027bff68d48d1c4f97be2,b7282584637aba28087bec61f8c071f5ac97df68..02940f8d3ab5b8c1e81e61bc00c4b57381839652
--- 1/hud_luminos_minimal.cfg
--- 2/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "1"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "1"
  seta hud_panel_weapons_noncurrent_scale "1"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding ""
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0 0.775000"

diff --combined hud_luminos_minimal_xhair.cfg
index bd4dc3f3f3504bec3d4cc0e3db9b008ff8d9d86a,3bfd694b19cf2f0977c36c437ed7ee5c8220d5f9..41a47d7ab2d77cd1e6cc4d486eb5a0bf924b37f8
--- 1/hud_luminos_minimal_xhair.cfg
--- 2/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "1"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "1"
  seta hud_panel_weapons_noncurrent_scale "1"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding ""
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0 0.775000"

diff --combined hud_luminos_old.cfg
index 82b70e2222ed2e265ca1c62c1f14cc36c7bab6f2,c808f62fb5b10ca9f430153f3260821fc0280ff9..f4a5e0441b97f3b5c7c5940330cc2585a9afde01
--- 1/hud_luminos_old.cfg
--- 2/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "1"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "1"
  seta hud_panel_weapons_noncurrent_scale "1"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding ""
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0.020000 0.780000"

diff --combined hud_nexuiz.cfg
index b3733967efd7029157ddd70c223e8905b7997013,b0b02d080c6e6517407ca8706a8315bca9160f46..ea5dc69a240f1fee326c3fd58e07b94fc6add213
--- 1/hud_nexuiz.cfg
--- 2/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@@ -64,7 -64,6 +64,7 @@@ seta hud_panel_weapons_timeout_fadefgmi
  seta hud_panel_weapons_timeout_speed_in "0.25"
  seta hud_panel_weapons_timeout_speed_out "0.75"
  seta hud_panel_weapons_onlyowned "0"
 +seta hud_panel_weapons_orderbyimpulse "1"
  seta hud_panel_weapons_noncurrent_alpha "1"
  seta hud_panel_weapons_noncurrent_scale "1"
  seta hud_panel_weapons_selection_radius "0"
@@@ -208,7 -207,7 +208,7 @@@ seta hud_panel_pressedkeys_bg_color_tea
  seta hud_panel_pressedkeys_bg_alpha ""
  seta hud_panel_pressedkeys_bg_border ""
  seta hud_panel_pressedkeys_bg_padding ""
- seta hud_panel_pressedkeys_aspect "1.6"
+ seta hud_panel_pressedkeys_aspect "1.8"
  seta hud_panel_pressedkeys_attack "0"
  
  seta hud_panel_chat_pos "0 0.760000"

diff --combined qcsrc/client/autocvars.qh
index dd6ba66af971838f2da2c1415d756a42619e21d9,d31d12205cfa88357521cc5f6baa8baf3717cdfa..d11355659aa8071a5795e030b555a01361aeeb8b
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -25,7 -25,6 +25,6 @@@ float autocvar_cl_announcer_antispam = 
  float autocvar_cl_announcer_maptime = 3;
  bool autocvar_cl_autodemo_delete;
  bool autocvar_cl_autodemo_delete_keeprecords;
- bool autocvar_cl_casings;
  float autocvar_cl_casings_bronze_time;
  int autocvar_cl_casings_maxcount = 100;
  float autocvar_cl_casings_shell_time;
@@@ -77,7 -76,7 +76,7 @@@ bool autocvar_cl_spawnzoom = 1
  float autocvar_cl_spawnzoom_speed = 1;
  float autocvar_cl_spawnzoom_factor = 2;
  bool autocvar_cl_stripcolorcodes;
- bool autocvar_cl_vehicles_alarm = true;
+ bool autocvar_cl_vehicles_alarm = false;
  bool autocvar_cl_vehicles_hud_tactical = true;
  float autocvar_cl_vehicles_hudscale = 0.5;
  float autocvar_cl_vehicles_notify_time = 15;
@@@ -151,6 -150,8 +150,8 @@@ bool autocvar_crosshair_ring_reload
  float autocvar_crosshair_ring_reload_alpha;
  float autocvar_crosshair_ring_reload_size;
  float autocvar_crosshair_size;
+ bool autocvar_crosshair_chase = true;
+ float crosshair_chase_playeralpha = 0.25;
  int autocvar_ekg;
  float autocvar_fov;
  bool autocvar_hud_cursormode = true;
@@@ -268,7 -269,6 +269,6 @@@ bool autocvar_hud_panel_infomessages_fl
  float autocvar_hud_panel_mapvote_highlight_border = 1;
  bool autocvar_hud_panel_modicons;
  int autocvar_hud_panel_modicons_ca_layout;
- int autocvar_hud_panel_modicons_dom_layout;
  int autocvar_hud_panel_modicons_freezetag_layout;
  bool autocvar_hud_panel_notify;
  float autocvar_hud_panel_notify_fadetime;
@@@ -351,7 -351,6 +351,7 @@@ float autocvar_hud_panel_weapons_select
  float autocvar_hud_panel_weapons_selection_speed = 10;
  float autocvar_hud_panel_weapons_timeout;
  int autocvar_hud_panel_weapons_timeout_effect;
 +bool autocvar_hud_panel_weapons_orderbyimpulse = true;
  float autocvar_hud_panel_weapons_timeout_fadebgmin;
  float autocvar_hud_panel_weapons_timeout_fadefgmin;
  float autocvar_hud_panel_weapons_timeout_speed_in = 0.25;
@@@ -382,6 -381,7 +382,7 @@@ float autocvar_hud_shownames_crosshaird
  bool autocvar_hud_shownames_self;
  bool autocvar_hud_shownames_status;
  float autocvar_hud_shownames_statusbar_height;
+ float autocvar_hud_shownames_statusbar_highlight = 1;
  float autocvar_hud_shownames_aspect;
  float autocvar_hud_shownames_fontsize;
  int autocvar_hud_shownames_decolorize;

diff --combined qcsrc/client/defs.qh
index 788c1bac31cce5f699e8ac3884562dd2e5349d9e,5ce4c3e60c3990a1f1492789ca47dee55cdc9bc6..4925ba51e3f1fc38568828fe0d61b78efdc47821
--- 1/qcsrc/client/defs.qh
--- 2/qcsrc/client/defs.qh
+++ b/qcsrc/client/defs.qh
@@@ -3,7 -3,6 +3,6 @@@
  // Additional OPTIONAL Fields and Globals
  //float               intermission;
  float         scoreboard_showscores;
- float         scoreboard_showaccuracy;
  .string               message;
  .float                renderflags;
  // float              coop;
@@@ -110,11 -109,72 +109,73 @@@ int w_deathtype
  float w_issilent, w_random;
  vector w_org, w_backoff;
  
+ float autoswitch;
+ bool cvar_cl_allow_uid2name;
+ bool cvar_cl_allow_uidranking;
+ float cvar_cl_autoscreenshot;
+ float cvar_cl_autotaunt;
+ float cvar_cl_clippedspectating;
+ int cvar_cl_gunalign;
+ float cvar_cl_handicap;
+ float cvar_cl_jetpack_jump;
+ float cvar_cl_movement_track_canjump;
+ float cvar_cl_noantilag;
+ string cvar_cl_physics;
+ float cvar_cl_voice_directional;
+ float cvar_cl_voice_directional_taunt_attenuation;
+ float cvar_cl_weaponimpulsemode;
+ string cvar_g_xonoticversion;
+ float cvar_cl_cts_noautoswitch;
+ bool cvar_cl_weapon_switch_reload;
+ bool cvar_cl_weapon_switch_fallback_to_impulse;
+ 
+ REPLICATE(autoswitch, bool, "cl_autoswitch");
+ REPLICATE(cvar_cl_allow_uid2name, bool, "cl_allow_uid2name");
+ REPLICATE(cvar_cl_allow_uidranking, bool, "cl_allow_uidranking");
+ REPLICATE(cvar_cl_autoscreenshot, int, "cl_autoscreenshot");
+ REPLICATE(cvar_cl_autotaunt, float, "cl_autotaunt");
+ REPLICATE(cvar_cl_clippedspectating, bool, "cl_clippedspectating");
+ REPLICATE(cvar_cl_gunalign, int, "cl_gunalign");
+ REPLICATE(cvar_cl_handicap, float, "cl_handicap");
+ REPLICATE(cvar_cl_jetpack_jump, bool, "cl_jetpack_jump");
+ REPLICATE(cvar_cl_movement_track_canjump, bool, "cl_movement_track_canjump");
+ REPLICATE(cvar_cl_noantilag, bool, "cl_noantilag");
+ REPLICATE(cvar_cl_physics, string, "cl_physics");
+ REPLICATE(cvar_cl_voice_directional, int, "cl_voice_directional");
+ REPLICATE(cvar_cl_voice_directional_taunt_attenuation, float, "cl_voice_directional_taunt_attenuation");
+ REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode");
+ REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion");
+ REPLICATE(cvar_cl_cts_noautoswitch, bool, "cl_cts_noautoswitch");
+ REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload");
+ REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse");
+ /*
+ // cvar cl_newusekeysupported doesn't exist
+ float cvar_cl_newusekeysupported;
+ REPLICATE(cvar_cl_newusekeysupported, bool, "cl_newusekeysupported");
+ */
+ string cvar_cl_allow_uidtracking;
+ REPLICATE(cvar_cl_allow_uidtracking, string, "cl_allow_uidtracking");
+ 
+ string cvar_cl_weaponpriority;
+ REPLICATE(cvar_cl_weaponpriority, string, "cl_weaponpriority");
+ 
+ string cvar_cl_weaponpriorities[10];
+ REPLICATE(cvar_cl_weaponpriorities[0], string, "cl_weaponpriority0");
+ REPLICATE(cvar_cl_weaponpriorities[1], string, "cl_weaponpriority1");
+ REPLICATE(cvar_cl_weaponpriorities[2], string, "cl_weaponpriority2");
+ REPLICATE(cvar_cl_weaponpriorities[3], string, "cl_weaponpriority3");
+ REPLICATE(cvar_cl_weaponpriorities[4], string, "cl_weaponpriority4");
+ REPLICATE(cvar_cl_weaponpriorities[5], string, "cl_weaponpriority5");
+ REPLICATE(cvar_cl_weaponpriorities[6], string, "cl_weaponpriority6");
+ REPLICATE(cvar_cl_weaponpriorities[7], string, "cl_weaponpriority7");
+ REPLICATE(cvar_cl_weaponpriorities[8], string, "cl_weaponpriority8");
+ REPLICATE(cvar_cl_weaponpriorities[9], string, "cl_weaponpriority9");
+ 
  float bgmtime;
  
  string weaponorder_byimpulse;
  string weaponorder_bypriority;
 +bool weapons_orderbyimpulse; // update priority list when toggling this
  
  float vortex_charge_movingavg;
  

diff --combined qcsrc/client/hud/panel/weapons.qc
index aae33881b66458886638c423b9962465c455cd46,fef3eec09e74d7a487c48bcabe702021256cb50b..832ffad0b38ca9b27727451808c44570e5d5eb79
--- 1/qcsrc/client/hud/panel/weapons.qc
--- 2/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@@ -26,18 -26,18 +26,18 @@@ int weaponorder_cmp(int i, int j, entit
        return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
  }
  
- #define HUD_WEAPONS_GET_FULL_LAYOUT() MACRO_BEGIN { \
+ #define HUD_WEAPONS_GET_FULL_LAYOUT() MACRO_BEGIN \
        int nHidden = 0; \
        FOREACH(Weapons, it != WEP_Null, { \
                if (weapons_stat & WepSet_FromWeapon(it)) continue; \
-               if ((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) nHidden += 1; \
+               if (it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)) nHidden += 1; \
        }); \
        vector table_size = HUD_GetTableSize_BestItemAR((Weapons_COUNT - 1) - nHidden, panel_size, aspect); \
        columns = table_size.x; \
        rows = table_size.y; \
        weapon_size.x = panel_size.x / columns; \
        weapon_size.y = panel_size.y / rows; \
- } MACRO_END
+ MACRO_END
  
  void HUD_Weapons()
  {
@@@ -63,7 -63,7 +63,7 @@@
        float when = max(1, autocvar_hud_panel_weapons_complainbubble_time);
        float fadetime = max(0, autocvar_hud_panel_weapons_complainbubble_fadetime);
  
-       bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_WEAPON_AMMO);
+       bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_AMMO);
  
        vector weapon_pos, weapon_size = '0 0 0';
        vector color;
@@@ -91,15 -91,11 +91,15 @@@
        HUD_Panel_LoadCvars();
  
        // figure out weapon order (how the weapons are sorted) // TODO make this configurable
 -      if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0])
 +      if(weaponorder_bypriority != autocvar_cl_weaponpriority || autocvar_hud_panel_weapons_orderbyimpulse != weapons_orderbyimpulse || !weaponorder[0])
        {
                int weapon_cnt;
 +              weapons_orderbyimpulse = autocvar_hud_panel_weapons_orderbyimpulse;
                strcpy(weaponorder_bypriority, autocvar_cl_weaponpriority);
 -              strcpy(weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(weaponorder_bypriority))));
 +              string weporder = W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(weaponorder_bypriority));
 +              if(autocvar_hud_panel_weapons_orderbyimpulse)
 +                      weporder = W_FixWeaponOrder_BuildImpulseList(weporder);
 +              strcpy(weaponorder_byimpulse, weporder);
                weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
  
                weapon_cnt = 0;
@@@ -127,7 -123,7 +127,7 @@@
                {
                        int j = 0;
                        FOREACH(Weapons, it != WEP_Null && it.impulse >= 0 && (it.impulse % 3 != 0) && j < 6, {
-                               if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+                               if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_SPECIALATTACK))
                                {
                                        if(!panel_switchweapon || j < 4)
                                                panel_switchweapon = it;
@@@ -422,8 -418,11 +422,11 @@@
                }
                else
                {
-                       if (((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) && !(weapons_stat & WepSet_FromWeapon(it)))
+                       if (it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)
+                               && !(weapons_stat & WepSet_FromWeapon(it)))
+                       {
                                continue;
+                       }
                }
  
                // figure out the drawing position of weapon
@@@ -494,7 -493,7 +497,7 @@@
                        }
  
                        // draw ammo status bar
-                       if(!infinite_ammo && autocvar_hud_panel_weapons_ammo && (it.ammo_type != RESOURCE_NONE))
+                       if(!infinite_ammo && autocvar_hud_panel_weapons_ammo && (it.ammo_type != RES_NONE))
                        {
                                float ammo_full;
                                a = getstati(GetAmmoStat(it.ammo_type)); // how much ammo do we have?
@@@ -503,12 -502,12 +506,12 @@@
                                {
                                        switch (it.ammo_type)
                                        {
-                                               case RESOURCE_SHELLS:  ammo_full = autocvar_hud_panel_weapons_ammo_full_shells;  break;
-                                               case RESOURCE_BULLETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_nails;   break;
-                                               case RESOURCE_ROCKETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break;
-                                               case RESOURCE_CELLS:   ammo_full = autocvar_hud_panel_weapons_ammo_full_cells;   break;
-                                               case RESOURCE_PLASMA:  ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma;  break;
-                                               case RESOURCE_FUEL:    ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel;    break;
+                                               case RES_SHELLS:  ammo_full = autocvar_hud_panel_weapons_ammo_full_shells;  break;
+                                               case RES_BULLETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_nails;   break;
+                                               case RES_ROCKETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break;
+                                               case RES_CELLS:   ammo_full = autocvar_hud_panel_weapons_ammo_full_cells;   break;
+                                               case RES_PLASMA:  ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma;  break;
+                                               case RES_FUEL:    ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel;    break;
                                                default: ammo_full = 60;
                                        }