Merge branch 'master' into mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/server/autocvars.qh
index 8d4e07edacdd5a4afc3d092b3f0a19383878dc68,08a6297ad44cf21e793edfc86e4949bb474dd0e4..25d0567a1af065a956e38ac09fa799c97f95fe31
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1277,53 -1272,3 +1272,53 @@@ float autocvar_physics_ode
  float autocvar_g_physical_items;
  float autocvar_g_physical_items_damageforcescale;
  float autocvar_g_physical_items_reset;
- string autocvar_g_monsters_spawn_list;
 +float autocvar_g_td_start_wave;
 +float autocvar_g_td_generator_health;
 +float autocvar_g_td_current_monsters;
 +float autocvar_g_td_generator_damaged_points;
 +float autocvar_g_td_monster_count;
 +float autocvar_g_td_monster_count_increment;
 +float autocvar_g_td_buildphase_time;
 +float autocvar_g_td_pvp;
 +float autocvar_g_td_max_waves;
 +float autocvar_g_td_kill_points;
 +float autocvar_g_td_turretkill_points;
 +float autocvar_g_td_generator_dontend;
 +float autocvar_g_td_force_settings;
 +float autocvar_g_td_turret_max;
 +float autocvar_g_td_turret_plasma_cost;
 +float autocvar_g_td_turret_mlrs_cost;
 +float autocvar_g_td_turret_walker_cost;
 +float autocvar_g_td_tower_buff_cost;
 +float autocvar_g_td_turret_flac_cost;
 +float autocvar_g_td_monsters_skill_start;
 +float autocvar_g_td_monsters_skill_increment;
 +float autocvar_g_td_monsters_speed_walk;
 +float autocvar_g_td_monsters_speed_run;
 +float autocvar_g_td_monsters_spawn_delay;
 +float autocvar_g_td_monsters_spawnshield_time;
 +float autocvar_g_td_turret_upgrade_cost;
 +float autocvar_g_td_turret_repair_cost;
 +float autocvar_g_za_monster_count;
 +float autocvar_g_monsters;
 +float autocvar_g_monsters_max;
 +float autocvar_g_monsters_max_perplayer;
 +float autocvar_g_monsters_giants_only;
 +float autocvar_g_monsters_typefrag;
 +float autocvar_g_monsters_owners;
 +float autocvar_g_monsters_miniboss_chance;
 +float autocvar_g_monsters_miniboss_healthboost;
 +float autocvar_g_monsters_forcedrop;
 +string autocvar_g_monsters_drop_type;
 +string autocvar_g_monsters_drop_size;
 +float autocvar_g_monsters_teams;
 +float autocvar_g_monsters_healthbars;
 +float autocvar_g_monsters_respawn_delay;
 +float autocvar_g_monsters_respawn;
 +float autocvar_g_monsters_nogiants;
 +float autocvar_g_monsters_skill_easy;
 +float autocvar_g_monsters_skill_normal;
 +float autocvar_g_monsters_skill_hard;
 +float autocvar_g_monsters_skill_insane;
 +float autocvar_g_monsters_skill_nightmare;
++string autocvar_g_monsters_spawn_list;

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

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

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

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

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

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

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

diff --cc qcsrc/server/tturrets/units/unit_walker.qc
Simple merge