From: Mario Date: Sun, 14 Dec 2014 01:54:09 +0000 (+1100) Subject: Move cvars to the proper location X-Git-Tag: xonotic-v0.8.0~88 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3c9859a793a28cc209319becdb467b711d761d0;p=xonotic%2Fxonotic-data.pk3dir.git Move cvars to the proper location --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 9f957ce07..918e00adb 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -420,8 +420,6 @@ set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) a set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\"" set g_weaponarena_random "0" "if set to a number, only that weapon count is given on every spawn (randomly)" set g_weaponarena_random_with_blaster "1" "additionally, always provide the blaster in random weapon arena games" -set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne" -set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground" set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid" set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once seconds are over" set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)" diff --git a/mutators.cfg b/mutators.cfg index c6716585c..e751ae117 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -39,6 +39,13 @@ set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carr set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health" +// ======== +// midair +// ======== +set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne" +set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground" + + // ========= // sandbox // =========