Merge branch 'martin-t/linkexplode' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 14 Jan 2020 13:34:32 +0000 (13:34 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jan 2020 13:34:32 +0000 (13:34 +0000)
Enable linkexplode by default again

See merge request xonotic/xonotic-data.pk3dir!706

.gitlab-ci.yml
bal-wep-xonotic.cfg

index ec9063ec09944c6c61a3fd1d661f204c84584eae..3e56730463f29ece0e3309e353fe0c851408e50e 100644 (file)
@@ -29,7 +29,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=4702792276f4902a051e97995eb7e138
+    - EXPECT=d5bda479d65190330f6ee23c6f9aa5e7
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'
index 52d63dfa2bbcd26332d1d551b05778f8a536cd67..7e153b3de6b51caa5c2a54698a504ec2c589b764 100644 (file)
@@ -243,7 +243,7 @@ set g_balance_crylink_primary_joinexplode_edgedamage 0
 set g_balance_crylink_primary_joinexplode_force 0
 set g_balance_crylink_primary_joinexplode_radius 0
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_linkexplode 0
+set g_balance_crylink_primary_linkexplode 1
 set g_balance_crylink_primary_middle_fadetime 5
 set g_balance_crylink_primary_middle_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5