From: Mario <mario@smbclan.net>
Date: Sun, 18 Aug 2019 09:26:50 +0000 (+1000)
Subject: Merge branch 'master' into martin-t/rulesets
X-Git-Tag: xonotic-v0.8.5~1386^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F688%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

5359f9a584275a854c94011dcc77e67e79bd76d6
diff --cc ruleset-XDF.cfg
index 8a9b85fdc,16cdd100a..a0cc24b7b
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@@ -7,21 -7,23 +7,22 @@@ exec balance-xdf.cf
  exec physicsXDF.cfg
  
  // general gameplay
 -// set g_jump_grunt 1 // just no
 -set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
 -set g_balance_kill_antispam 0
 -set g_forced_respawn 1
 +// g_jump_grunt 1 // just no
 +g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
 +g_balance_kill_antispam 0
 +g_forced_respawn 1
  // g_playerclip_collisions 0 // do not check playerclips
 -set g_powerups 0  // set to -1 or patch xonotic
 -set g_spawnpoints_auto_move_out_of_solid 1
 -set g_start_delay 3
 -set g_use_ammunition 0 "if set to 0 all weapons have unlimited ammunition"
 -set g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
 -set teamplay_mode 2 // friendly fire and self damage
 -set sv_vote_nospectators 1
 -set timelimit_override 20
 -set g_buffs_cooldown_respawn 0.1
 -set g_buffs_randomize 0
 +g_powerups 0  // set to -1 or patch xonotic
 +g_spawnpoints_auto_move_out_of_solid 1
 +g_start_delay 3
 +g_use_ammunition 0 "if set to 0 all weapons have unlimited ammunition"
 +g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
 +teamplay_mode 2 // friendly fire and self damage
 +sv_vote_nospectators 1
 +timelimit_override 20
 +g_buffs_cooldown_respawn 0.1
++g_buffs_randomize 0
  
  // game mode settings
 -set g_cts_finish_kill_delay 2
 -set g_cts_respawn_delay 0
 -set g_cts_selfdamage 0
 +g_cts_finish_kill_delay 2
 +g_cts_selfdamage 0