Merge branch 'master' into Mario/rifle_arena

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / autocvars.qh

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index dead5a9d4b360d924a0642f4b21fe0161e734ccd..ef695c3186648eaf6e1800e2e0293f0f8197928b 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1110,11 +1110,13 @@ float autocvar_sv_defaultplayerskin;
 float autocvar_sv_dodging_delay;
 float autocvar_sv_dodging_height_threshold;
 float autocvar_sv_dodging_horiz_speed;
+float autocvar_sv_dodging_horiz_speed_frozen;
 float autocvar_sv_dodging_ramp_time;
 float autocvar_sv_dodging_sound;
 float autocvar_sv_dodging_up_speed;
 float autocvar_sv_dodging_wall_distance_threshold;
 float autocvar_sv_dodging_wall_dodging;
+float autocvar_sv_dodging_frozen;
 float autocvar_sv_doublejump;
 float autocvar_sv_eventlog;
 float autocvar_sv_eventlog_console;
@@ -1234,3 +1236,14 @@ float autocvar_g_touchexplode_radius;
 float autocvar_g_touchexplode_damage;
 float autocvar_g_touchexplode_edgedamage;
 float autocvar_g_touchexplode_force;
+float autocvar_g_riflearena_nades;
+float autocvar_g_riflearena_nade_lifetime;
+float autocvar_g_riflearena_nade_damage;
+float autocvar_g_riflearena_nade_edgedamage;
+float autocvar_g_riflearena_nade_radius;
+float autocvar_g_riflearena_nade_force;
+float autocvar_g_riflearena_nade_health;
+float autocvar_g_riflearena_nade_newton_style;
+float autocvar_g_riflearena_nade_minforce;
+float autocvar_g_riflearena_nade_maxforce;
+float autocvar_g_riflearena_nade_refire;