Merge branch 'martin-t/electro-denoobing' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
commit0257ecb2eed69a4d4e871a51f1ccb4afc1bcdf1a
tree127d8ecdd7361d160d4a4c9009315012e1af729a
parentb137896768ee22017cd43bf7614b8c01f99acd9c
parent3a8534fb9a0bd460d360f0231014433a8b21cf1c
Merge branch 'martin-t/electro-denoobing' into 'master'

Electro: midair combos

See merge request xonotic/xonotic-data.pk3dir!757
bal-wep-testing.cfg
bal-wep-xonotic.cfg