Disable recoil, the current implementation is unpopular

https://xonotic.org/balancevotes/5/

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc4ce4ffff5d36693fedc43f255f7f70816102ca..5637179f1953643a4cbb29999eaa708d710038b1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ test_sv_game:
     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
 
-    - EXPECT=f69ef2a13dbe594a0284660e60bdc903
+    - EXPECT=57325fe74835910e451ba42d31de8f34
     - HASH=$(${ENGINE} +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 61db289a70c5b987786520152e24d768b0235bcc..819ef7a50625ba67450a0f2ecafc4bad72ed8e98 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -221,7 +221,7 @@ set g_fullbrightitems 0 "disables lighting effects on items, making them appear
 set g_nodepthtestplayers 0 "disables depth testing on players"
 set g_nodepthtestitems 0 "disables depth testing on items"
 set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: shotgun and machine gun casings) are sent to the client"
-set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
+set g_norecoil 1 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 set g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again"
 set g_maplist_index 0 "this is used internally for saving position in maplist cycle"