]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 381e026 d531e6e)
Merge branch 'terencehill/blaster_attack_shared' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 25 Aug 2024 15:13:54 +0000 (15:13 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 25 Aug 2024 15:13:54 +0000 (15:13 +0000)
commitbe66a429acc7623ecc52436e56c0e1266a0e95f8
tree0a608ebffa6ebb8e88357bcf9aff8ad36a2afae4tree | snapshot
parent381e026f27fe95084485d1541471196fca1f3904commit | diff
parentd531e6e0a0c19f2e8bdeb954aa706af349f27e73commit | diff
Merge branch 'terencehill/blaster_attack_shared' into 'master'

Make weapons using blaster as secondary attack load settings from blaster

See merge request xonotic/xonotic-data.pk3dir!1282
qcsrc/common/weapons/weapon/electro.qc diff1 | diff2 | blob | history