Merge branch 'master' into martin-t/mg-solidpen

diff --combined bal-wep-xpm.cfg
index 23c85c49528856e2a0c87637696fc10152b2fe0c,5117bc2accd3c278790adf8a80b094c899d67af4..610e4e273b1ea6a6916dcc1fff523af3c43bc972
--- 1/bal-wep-xpm.cfg
--- 2/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@@ -81,7 -81,7 +81,7 @@@ set g_balance_machinegun_first_spread 0
  set g_balance_machinegun_mode 1
  set g_balance_machinegun_reload_ammo 60
  set g_balance_machinegun_reload_time 2
 -set g_balance_machinegun_solidpenetration 13.1
 +set g_balance_machinegun_solidpenetration 63
  set g_balance_machinegun_spread_add 0.012
  set g_balance_machinegun_spread_max 0.05
  set g_balance_machinegun_spread_min 0.02
@@@ -787,7 -787,7 +787,7 @@@ set g_balance_okhmg_primary_ammo 
  set g_balance_okhmg_primary_damage 30
  set g_balance_okhmg_primary_force 10
  set g_balance_okhmg_primary_refire 0.05
- set g_balance_okhmg_primary_solidpenetration 32
+ set g_balance_okhmg_primary_solidpenetration 127
  set g_balance_okhmg_primary_spread_add 0.005
  set g_balance_okhmg_primary_spread_max 0.06
  set g_balance_okhmg_primary_spread_min 0.01
@@@ -798,7 -798,7 +798,7 @@@ set g_balance_okhmg_secondary_animtime 
  set g_balance_okhmg_secondary_damage 25
  set g_balance_okhmg_secondary_delay 0
  set g_balance_okhmg_secondary_edgedamage 12.5
- set g_balance_okhmg_secondary_force 300
+ set g_balance_okhmg_secondary_force 360
  set g_balance_okhmg_secondary_force_zscale 1
  set g_balance_okhmg_secondary_lifetime 5
  set g_balance_okhmg_secondary_radius 70
@@@ -816,25 -816,25 +816,25 @@@ set g_balance_okhmg_weaponthrowable 
  // }}}
  // {{{ #22: Overkill MachineGun (MUTATOR WEAPON)
  set g_balance_okmachinegun_primary_ammo 1
- set g_balance_okmachinegun_primary_damage 10
- set g_balance_okmachinegun_primary_force 3
+ set g_balance_okmachinegun_primary_damage 25
+ set g_balance_okmachinegun_primary_force 5
  set g_balance_okmachinegun_primary_refire 0.1
- set g_balance_okmachinegun_primary_solidpenetration 13.1
+ set g_balance_okmachinegun_primary_solidpenetration 100
  set g_balance_okmachinegun_primary_spread_add 0.012
  set g_balance_okmachinegun_primary_spread_max 0.05
- set g_balance_okmachinegun_primary_spread_min 0.02
- set g_balance_okmachinegun_reload_ammo 60
- set g_balance_okmachinegun_reload_time 2
+ set g_balance_okmachinegun_primary_spread_min 0
+ set g_balance_okmachinegun_reload_ammo 30
+ set g_balance_okmachinegun_reload_time 1.5
  set g_balance_okmachinegun_secondary_animtime 0.2
- set g_balance_okmachinegun_secondary_damage 20
+ set g_balance_okmachinegun_secondary_damage 25
  set g_balance_okmachinegun_secondary_delay 0
- set g_balance_okmachinegun_secondary_edgedamage 10
- set g_balance_okmachinegun_secondary_force 300
+ set g_balance_okmachinegun_secondary_edgedamage 12.5
+ set g_balance_okmachinegun_secondary_force 360
  set g_balance_okmachinegun_secondary_force_zscale 1
  set g_balance_okmachinegun_secondary_lifetime 5
- set g_balance_okmachinegun_secondary_radius 60
+ set g_balance_okmachinegun_secondary_radius 70
  set g_balance_okmachinegun_secondary_refire 0.7
- set g_balance_okmachinegun_secondary_refire_type 0
+ set g_balance_okmachinegun_secondary_refire_type 1
  set g_balance_okmachinegun_secondary_shotangle 0
  set g_balance_okmachinegun_secondary_speed 6000
  set g_balance_okmachinegun_secondary_spread 0
@@@ -846,7 -846,7 +846,7 @@@ set g_balance_okmachinegun_weaponstarto
  set g_balance_okmachinegun_weaponthrowable 1
  // }}}
  // {{{ #23: Overkill Nex (MUTATOR WEAPON)
- set g_balance_oknex_charge 1
+ set g_balance_oknex_charge 0
  set g_balance_oknex_charge_animlimit 0.5
  set g_balance_oknex_charge_limit 1
  set g_balance_oknex_charge_maxspeed 800
@@@ -858,36 -858,36 +858,36 @@@ set g_balance_oknex_charge_rot_rate 
  set g_balance_oknex_charge_shot_multiplier 0
  set g_balance_oknex_charge_start 0.5
  set g_balance_oknex_charge_velocity_rate 0
- set g_balance_oknex_primary_ammo 6
- set g_balance_oknex_primary_animtime 0.4
- set g_balance_oknex_primary_damage 80
+ set g_balance_oknex_primary_ammo 10
+ set g_balance_oknex_primary_animtime 0.65
+ set g_balance_oknex_primary_damage 100
  set g_balance_oknex_primary_damagefalloff_forcehalflife 0
  set g_balance_oknex_primary_damagefalloff_halflife 0
  set g_balance_oknex_primary_damagefalloff_maxdist 0
  set g_balance_oknex_primary_damagefalloff_mindist 0
- set g_balance_oknex_primary_force 400
- set g_balance_oknex_primary_refire 1.5
- set g_balance_oknex_reload_ammo 0
+ set g_balance_oknex_primary_force 500
+ set g_balance_oknex_primary_refire 1
+ set g_balance_oknex_reload_ammo 50
  set g_balance_oknex_reload_time 2
- set g_balance_oknex_secondary 0
- set g_balance_oknex_secondary_ammo 2
- set g_balance_oknex_secondary_animtime 0
+ set g_balance_oknex_secondary 2
+ set g_balance_oknex_secondary_ammo 0
+ set g_balance_oknex_secondary_animtime 0.2
  set g_balance_oknex_secondary_chargepool 0
  set g_balance_oknex_secondary_chargepool_pause_regen 1
  set g_balance_oknex_secondary_chargepool_regen 0.15
- set g_balance_oknex_secondary_damage 0
+ set g_balance_oknex_secondary_damage 25
  set g_balance_oknex_secondary_damagefalloff_forcehalflife 0
  set g_balance_oknex_secondary_damagefalloff_halflife 0
  set g_balance_oknex_secondary_damagefalloff_maxdist 0
  set g_balance_oknex_secondary_damagefalloff_mindist 0
  set g_balance_oknex_secondary_delay 0
- set g_balance_oknex_secondary_edgedamage 10
- set g_balance_oknex_secondary_force 0
+ set g_balance_oknex_secondary_edgedamage 12.5
+ set g_balance_oknex_secondary_force 360
  set g_balance_oknex_secondary_force_zscale 1
  set g_balance_oknex_secondary_lifetime 5
- set g_balance_oknex_secondary_radius 60
- set g_balance_oknex_secondary_refire 0
- set g_balance_oknex_secondary_refire_type 0
+ set g_balance_oknex_secondary_radius 70
+ set g_balance_oknex_secondary_refire 0.7
+ set g_balance_oknex_secondary_refire_type 1
  set g_balance_oknex_secondary_shotangle 0
  set g_balance_oknex_secondary_speed 6000
  set g_balance_oknex_secondary_spread 0
@@@ -919,7 -919,7 +919,7 @@@ set g_balance_okrpc_secondary_animtime 
  set g_balance_okrpc_secondary_damage 25
  set g_balance_okrpc_secondary_delay 0
  set g_balance_okrpc_secondary_edgedamage 12.5
- set g_balance_okrpc_secondary_force 300
+ set g_balance_okrpc_secondary_force 360
  set g_balance_okrpc_secondary_force_zscale 1
  set g_balance_okrpc_secondary_lifetime 5
  set g_balance_okrpc_secondary_radius 70
@@@ -936,27 -936,27 +936,27 @@@ set g_balance_okrpc_weaponstartoverrid
  set g_balance_okrpc_weaponthrowable 0
  // }}}
  // {{{ #25: Overkill Shotgun (MUTATOR WEAPON)
- set g_balance_okshotgun_primary_ammo 1
- set g_balance_okshotgun_primary_animtime 0.2
+ set g_balance_okshotgun_primary_ammo 3
+ set g_balance_okshotgun_primary_animtime 0.65
  set g_balance_okshotgun_primary_bot_range 512
- set g_balance_okshotgun_primary_bullets 12
- set g_balance_okshotgun_primary_damage 4
- set g_balance_okshotgun_primary_force 15
+ set g_balance_okshotgun_primary_bullets 10
+ set g_balance_okshotgun_primary_damage 17
+ set g_balance_okshotgun_primary_force 80
  set g_balance_okshotgun_primary_refire 0.75
  set g_balance_okshotgun_primary_solidpenetration 3.8
- set g_balance_okshotgun_primary_spread 0.12
- set g_balance_okshotgun_reload_ammo 0
+ set g_balance_okshotgun_primary_spread 0.07
+ set g_balance_okshotgun_reload_ammo 24
  set g_balance_okshotgun_reload_time 2
  set g_balance_okshotgun_secondary_animtime 0.2
- set g_balance_okshotgun_secondary_damage 20
+ set g_balance_okshotgun_secondary_damage 25
  set g_balance_okshotgun_secondary_delay 0
- set g_balance_okshotgun_secondary_edgedamage 10
- set g_balance_okshotgun_secondary_force 300
+ set g_balance_okshotgun_secondary_edgedamage 12.5
+ set g_balance_okshotgun_secondary_force 360
  set g_balance_okshotgun_secondary_force_zscale 1
  set g_balance_okshotgun_secondary_lifetime 5
- set g_balance_okshotgun_secondary_radius 60
+ set g_balance_okshotgun_secondary_radius 70
  set g_balance_okshotgun_secondary_refire 0.7
- set g_balance_okshotgun_secondary_refire_type 0
+ set g_balance_okshotgun_secondary_refire_type 1
  set g_balance_okshotgun_secondary_shotangle 0
  set g_balance_okshotgun_secondary_speed 6000
  set g_balance_okshotgun_secondary_spread 0

diff --combined qcsrc/server/autocvars.qh
index 21e71c5c65bdd15f7619a21ca5a6af2e853c063b,b14eb0c8079cf837168c1f20f26c62ae7a8ead9f..7f3c0b7207b0b21f257e76ad357c215d5aa9de17
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -91,8 -91,7 +91,8 @@@ float autocvar_g_balance_selfdamageperc
  float autocvar_g_ballistics_density_corpse;
  float autocvar_g_ballistics_density_player;
  float autocvar_g_ballistics_mindistance;
 -bool autocvar_g_ballistics_penetrate_clips;
 +bool autocvar_g_ballistics_penetrate_clips = true;
 +float autocvar_g_ballistics_solidpenetration_exponent = 0.25;
  float autocvar_g_ban_default_bantime;
  float autocvar_g_ban_default_masksize;
  float autocvar_g_ban_sync_interval;
@@@ -158,6 -157,7 +158,7 @@@ bool autocvar_g_maplist_votable_suggest
  bool autocvar_g_maplist_votable_suggestions_override_mostrecent;
  float autocvar_g_maplist_votable_timeout;
  bool autocvar_g_maplist_ignore_sizes;
+ bool autocvar_g_maplist_sizes_count_bots = true;
  int autocvar_g_maxplayers;
  float autocvar_g_maxplayers_spectator_blocktime;
  float autocvar_g_maxpushtime;

diff --combined qcsrc/server/defs.qh
index 65d2bd6631fdd7cb1ffce418be3a1dc008e6352f,2c95f7a4bec175fdcc46c0d727f7c84842172973..b1d73f6a3124c87110d254d1f2bc73f739003d38
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -163,6 -163,7 +163,7 @@@ float default_player_alpha
  float default_weapon_alpha;
  
  .float cvar_cl_handicap;
+ .int cvar_cl_gunalign;
  .float cvar_cl_clippedspectating;
  .float cvar_cl_autoscreenshot;
  .float cvar_cl_jetpack_jump;
@@@ -331,7 -332,7 +332,7 @@@ string deathmessage
  .float cvar_cl_weaponimpulsemode;
  .int selectweapon; // last selected weapon of the player
  
 -.float ballistics_density; // wall piercing factor, larger = bullet can pass through more
 +.float ballistics_density;
  
  //const int FROZEN_NOT                                = 0;
  const int FROZEN_NORMAL                               = 1;

diff --combined xonotic-server.cfg
index 65dac0d52c1da66b78cbdebd3c18ef996d2cdc36,f914a7b11e3bafdae0391c329811d081c8aee130..9dbfdc8f692a1862590ca8b42db06b91b1c69e89
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -213,6 -213,7 +213,7 @@@ set g_maplist_selectrandom 0       "if 1, a r
  set g_maplist_shuffle 1       "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
  set g_maplist_check_waypoints 0       "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
  set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardless of player count"
+ set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
  
  set g_items_mindist 4000 "starting distance for the fading of items"
  set g_items_maxdist 4500 "maximum distance at which an item can be viewed, after which it will be invisible"
@@@ -420,11 -421,15 +421,11 @@@ set g_ban_sync_trusted_servers_verify 
  
  set g_showweaponspawns 1 "1: display waypoints for weapon spawns found on the map when a weapon key is pressed and the weapon is not owned; 2: for dropped weapons too; 3: for all the weapons sharing the same impulse"
  
 -// ballistics use physical units, but qu based
 -//   Quake-Newton: 1 qN  = 1 qu * 1 g / 1 s^2
 -//   Quake-Joule:  1 qJ  = 1 qN * 1 qu
 -//   Quake-Pascal: 1 qPa = 1 qN / 1 qu^2
 -
 -set g_ballistics_mindistance 2 "enable ballistics starting from 2 qu"
 -set g_ballistics_density_player 0.50 "players are 2x as easy to pass through as walls"
 -set g_ballistics_density_corpse 0.10 "corpses are 10x as easy to pass through as walls"
 -set g_ballistics_penetrate_clips 0 "allow ballistics to pass through weapon clips"
 +set g_ballistics_mindistance 2 "when shooting through walls thinner than this, treat them as this thick (useful because patches (curved surfaces) have no thickness)"
 +set g_ballistics_density_player 0.50 "how hard players are to shoot through compared to walls"
 +set g_ballistics_density_corpse 0.10 "how hard corpses are to shoot through compared to walls"
 +set g_ballistics_penetrate_clips 1 "allow ballistics to pass through weapon clips"
 +set g_ballistics_solidpenetration_exponent 0.25 "how fast damage falls off when bullets pass through walls - 1 means linear, lower values mean slower initial falloff but faster once there's little solidpenetration left (damage_fraction = solidpen_fraction^exp for solidpen_fraction between 0 and 1)"
  
  sv_status_show_qcstatus 1     "Xonotic uses this field instead of frags"
  set g_full_getstatus_responses 0      "this currently breaks qstat"