Merge branch 'master' into mirceakitsune/damage_effects

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 52c14b2be90d9f41000144d0ad6a9060b27e3e35..120ed42cf1d808530e444f7f4f2cc82bd95abba0 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -321,6 +321,14 @@ set g_telefrags_teamplay 1 "never telefrag team mates"
 set g_telefrags_avoid 1 "when teleporters have a random destination, avoid teleporting to locations where a telefrag would happen"
 set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
 
+set cl_damageeffect 1 "enable weapon damage effects. 1 enables the feature on skeletal models, 2 on any model"
+set cl_damageeffect_ticrate 0.1 "particle spawn rate"
+set cl_damageeffect_bones 5 "how many damages to allow on a rigged mesh at once (non-skeletal objects are limited to one)"
+set cl_damageeffect_distribute 1 "divide particle intensity if multiple damages are present"
+set cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, based on damage amount"
+set cl_damageeffect_lifetime_min 3 "minimum lifetime a damage effect may have"
+set cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have"
+
 set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"