]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Tue, 15 Aug 2023 19:36:18 +0000 (15:36 -0400)
committerz411 <z411@omaera.org>
Tue, 15 Aug 2023 19:36:18 +0000 (15:36 -0400)
commit6106254e420c75e9a4b9e539f7d7219f44ca7ff1
tree1a760b94ca2861d5161003c4d4f928ed4d18b478
parent6491b766d925a1088212e86cf4767d4be7bf6a4f
parent414abe43bfc7d7f8ce54ecb0a39ce9b049113ca2
Merge branch 'master' into z411/bai-server
commands.cfg
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/main.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/notifications/all.inc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/world.qc