]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Sun, 18 Jul 2021 00:48:31 +0000 (10:48 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sun, 18 Jul 2021 00:48:31 +0000 (10:48 +1000)
commit5dc828e3b59c65f75c870d4a57e34c023cdbdb86
treea11c91f84d2b94ef9875d4d10f745c6678e1dd96
parent39ff67006e98371c2961166ea52984024d9d3fab
parent2adb97ad5906634c812f5d1454ba9b01831f3f1d
Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat
15 files changed:
qcsrc/common/items/item.qh
qcsrc/common/mutators/mutator/buffs/all.inc
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/lib/spawnfunc.qh
qcsrc/lib/warpzone/common.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/world.qc
xonotic-server.cfg