From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 4 Jun 2014 09:32:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Mario/hook_refire'
X-Git-Tag: xonotic-v0.8.0~190
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b8bf0a16d1c441ae346e4cefcbe80ae4f2937f85;hp=-c

Merge remote-tracking branch 'origin/Mario/hook_refire'

* origin/Mario/hook_refire:
  Add a new cvar for offhand hook refire
  Obey refire delay in offhand hook mode
  Also add delay to Nexuiz balance
  Add a 0.2 second delay on grappling hook to prevent spam
---

b8bf0a16d1c441ae346e4cefcbe80ae4f2937f85
diff --combined qcsrc/server/autocvars.qh
index ee7d24d8b9,46c9d95517..080d701d86
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -260,6 -260,7 +260,7 @@@ float autocvar_g_balance_grapplehook_sp
  float autocvar_g_balance_grapplehook_speed_pull;
  float autocvar_g_balance_grapplehook_stretch;
  float autocvar_g_balance_grapplehook_damagedbycontents;
+ float autocvar_g_balance_grapplehook_refire;
  float autocvar_g_balance_grenadelauncher_bouncefactor;
  float autocvar_g_balance_grenadelauncher_bouncestop;
  float autocvar_g_balance_grenadelauncher_primary_ammo;
@@@ -336,6 -337,7 +337,6 @@@ float autocvar_g_balance_health_regenst
  float autocvar_g_balance_health_rot;
  float autocvar_g_balance_health_rotlinear;
  float autocvar_g_balance_health_rotstable;
 -float autocvar_g_balance_health_start;
  float autocvar_g_balance_hlac_primary_ammo;
  float autocvar_g_balance_hlac_primary_animtime;
  float autocvar_g_balance_hlac_primary_damage;
@@@ -694,7 -696,6 +695,7 @@@ float autocvar_g_ca_round_timelimit
  float autocvar_g_ca_spectate_enemies;
  float autocvar_g_ca_teams;
  float autocvar_g_ca_teams_override;
 +float autocvar_g_ca_team_spawns;
  float autocvar_g_ca_warmup;
  float autocvar_g_campaign;
  #define autocvar_g_campaign_forceteam cvar("g_campaign_forceteam")
@@@ -716,7 -717,6 +717,7 @@@ float autocvar_g_chat_teamcolors
  float autocvar_g_chat_tellprivacy;
  float autocvar_g_ctf_allow_vehicle_carry;
  float autocvar_g_ctf_allow_vehicle_touch;
 +float autocvar_g_ctf_allow_monster_touch;
  float autocvar_g_ctf_throw;
  float autocvar_g_ctf_throw_angle_max;
  float autocvar_g_ctf_throw_angle_min;
@@@ -795,6 -795,7 +796,6 @@@ float autocvar_g_domination_point_leadl
  float autocvar_g_domination_point_rate;
  float autocvar_g_domination_teams_override;
  float autocvar_g_forced_respawn;
 -float autocvar_g_respawn_delay_max;
  string autocvar_g_forced_team_blue;
  string autocvar_g_forced_team_otherwise;
  string autocvar_g_forced_team_pink;
@@@ -812,7 -813,6 +813,7 @@@ float autocvar_g_freezetag_revive_clear
  float autocvar_g_freezetag_round_timelimit;
  float autocvar_g_freezetag_teams;
  float autocvar_g_freezetag_teams_override;
 +float autocvar_g_freezetag_team_spawns;
  float autocvar_g_freezetag_warmup;
  #define autocvar_g_friendlyfire cvar("g_friendlyfire")
  #define autocvar_g_friendlyfire_virtual cvar("g_friendlyfire_virtual")
@@@ -943,11 -943,7 +944,11 @@@ float autocvar_g_projectiles_spread_sty
  float autocvar_g_race_qualifying_timelimit;
  float autocvar_g_race_qualifying_timelimit_override;
  float autocvar_g_race_teams;
 -float autocvar_g_respawn_delay;
 +float autocvar_g_respawn_delay_small;
 +float autocvar_g_respawn_delay_small_count;
 +float autocvar_g_respawn_delay_large;
 +float autocvar_g_respawn_delay_large_count;
 +float autocvar_g_respawn_delay_max;
  float autocvar_g_respawn_ghosts;
  float autocvar_g_respawn_ghosts_maxtime;
  float autocvar_g_respawn_ghosts_speed;
@@@ -1219,40 -1215,10 +1220,40 @@@ float autocvar_physics_ode
  float autocvar_g_physical_items;
  float autocvar_g_physical_items_damageforcescale;
  float autocvar_g_physical_items_reset;
 +float autocvar_g_monsters;
 +float autocvar_g_monsters_edit;
 +float autocvar_g_monsters_sounds;
 +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_attack_range;
 +float autocvar_g_monsters_score_kill;
 +float autocvar_g_monsters_score_spawned;
 +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_drop_time;
 +float autocvar_g_monsters_spawnshieldtime;
 +float autocvar_g_monsters_teams;
 +float autocvar_g_monsters_respawn_delay;
 +float autocvar_g_monsters_respawn;
 +float autocvar_g_monsters_armor_blockpercent;
  float autocvar_g_touchexplode_radius;
  float autocvar_g_touchexplode_damage;
  float autocvar_g_touchexplode_edgedamage;
  float autocvar_g_touchexplode_force;
 +float autocvar_g_invasion_round_timelimit;
 +float autocvar_g_invasion_teams;
 +float autocvar_g_invasion_team_spawns;
 +float autocvar_g_invasion_spawnpoint_spawn_delay;
 +#define autocvar_g_invasion_point_limit cvar("g_invasion_point_limit")
 +float autocvar_g_invasion_warmup;
 +float autocvar_g_invasion_monster_count;
 +float autocvar_g_invasion_zombies_only;
 +float autocvar_g_invasion_spawn_delay;
  #define autocvar_g_bloodloss cvar("g_bloodloss")
  float autocvar_g_random_gravity_negative_chance;
  float autocvar_g_random_gravity_min;
@@@ -1276,9 -1242,3 +1277,9 @@@ float autocvar_g_campcheck_damage
  float autocvar_g_campcheck_distance;
  float autocvar_g_campcheck_interval;
  float autocvar_g_jump_grunt;
 +float autocvar_g_spawn_near_teammate_distance;
 +float autocvar_g_spawn_near_teammate_ignore_spawnpoint;
 +float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
 +float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
 +float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
 +float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;