From: Mario <mario.mario@y7mail.com>
Date: Sun, 28 Apr 2013 22:57:23 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~268
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49e38e46261f04cd3208ac6f26aa00f5c567020b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

49e38e46261f04cd3208ac6f26aa00f5c567020b
diff --cc qcsrc/server/autocvars.qh
index 5f1169117,15ad76c87..eedb8d29a
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1223,51 -1222,7 +1223,55 @@@ float autocvar_physics_ode
  float autocvar_g_physical_items;
  float autocvar_g_physical_items_damageforcescale;
  float autocvar_g_physical_items_reset;
 +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_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_monsters_ignore_turrets;
 +float autocvar_g_td_turret_upgrade_cost;
 +float autocvar_g_td_turret_repair_cost;
 +float autocvar_g_td_barricade_damage;
 +float autocvar_g_monsters;
 +float autocvar_g_monsters_think_delay;
 +float autocvar_g_monsters_max;
 +float autocvar_g_monsters_max_perplayer;
 +float autocvar_g_monsters_target_range;
 +float autocvar_g_monsters_target_infront;
 +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;
 +float autocvar_g_monsters_drop_time;
 +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_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;
+ float autocvar_g_touchexplode_radius;
+ float autocvar_g_touchexplode_damage;
+ float autocvar_g_touchexplode_edgedamage;
+ float autocvar_g_touchexplode_force;