Merge branch 'Mario/nade_orb_overlay' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 11 Sep 2022 21:26:15 +0000 (21:26 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 11 Sep 2022 21:26:15 +0000 (21:26 +0000)
commitd126fd4da497fb8c7cbd5939ed9c6ee07cd2df9c
tree40cfdab6d141e4601d3a36322b1cb82eda5460e2
parent068fc1c916164bbff2654d638a372cf6d642e650
parent6628d3f40d45228f59960fbaeed8dbbf64ff33bf
Merge branch 'Mario/nade_orb_overlay' into 'master'

Merge branch Mario/nade_orb_overlay  (S merge request)

See merge request xonotic/xonotic-data.pk3dir!1035
qcsrc/common/mutators/mutator/nades/nades.qc