From: Mario <zacjardine@y7mail.com>
Date: Fri, 25 Aug 2017 11:33:33 +0000 (+0000)
Subject: Merge branch 'martin-t/gunalign' into 'master'
X-Git-Tag: xonotic-v0.8.5~2509
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;hp=25255db624631282c5e1765efbc9635083bdc532

Merge branch 'martin-t/gunalign' into 'master'

Gunalign

See merge request !460
---

diff --git a/defaultClient.cfg b/defaultClient.cfg
index 7aa1ad5cf0..c12f69feeb 100644
--- a/defaultClient.cfg
+++ b/defaultClient.cfg
@@ -269,7 +269,7 @@ r_shadow_realtime_world_lightmaps 1
 r_shadow_realtime_world_importlightentitiesfrommap 0 // Whether build process uses keepLights is nontransparent and may change, so better make keepLights not matter.
 cl_decals_fadetime 5
 cl_decals_time 1
-seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
+seta cl_gunalign 3 "Gun alignment; 1 = center, 3 = right, 4 = left; requires reconnect"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
 seta cl_gibs_damageforcescale 3.5 "force to push around gibs"