]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/new_powerups
authorterencehill <piuntn@gmail.com>
Mon, 3 Jun 2024 12:52:45 +0000 (14:52 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 3 Jun 2024 12:59:36 +0000 (14:59 +0200)
commit8a829268a8d0e3e6aad13b3425e410e71f7cc99e
treece6f5390f367889f0e7275a1d94d92e4c205b021
parent7a8fbf0d300e77f475e77b87542b136cdbc25b14
parentf66ee3c1299ca55b7dc56c7613505fe24049a32a
Merge branch 'master' into LegendaryGuard/new_powerups

# Conflicts:
# qcsrc/common/mutators/mutator/powerups/powerups.qh
qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
qcsrc/common/mutators/mutator/powerups/powerup/shield.qh
qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
qcsrc/common/mutators/mutator/powerups/powerup/strength.qh
qcsrc/common/mutators/mutator/powerups/powerups.qh
qcsrc/common/notifications/all.inc