]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <theasixchan777@gmail.com>
Sat, 11 Sep 2021 16:51:17 +0000 (18:51 +0200)
committerLegendaryGuard <theasixchan777@gmail.com>
Sat, 11 Sep 2021 16:51:17 +0000 (18:51 +0200)
commitf64f0278c2b65c99d051a75313a3f6f8fffceb85
tree8cb192f61b13d2e668b4d9ff951eeea79c8ae9ce
parentfa5be828e1615d2ae3d9637c0f7ffe53aa5454bc
parent350dd64390082f01f29e0d4e4ef70390ba700219
Merge branch 'master' into LegendaryGuard/cyber
12 files changed:
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/weapons.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/items/items.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh
qcsrc/server/world.qc