]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'z411/bai-server' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 21 Jul 2021 21:22:13 +0000 (23:22 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 21 Jul 2021 21:22:13 +0000 (23:22 +0200)
1  2 
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/notifications/all.inc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/client.qh
qcsrc/server/damage.qc
qcsrc/server/world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge