]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 13 Jan 2022 22:38:50 +0000 (23:38 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 13 Jan 2022 22:38:50 +0000 (23:38 +0100)
commitc6911d44557d1905dfeecbb47bd3914c9c96a233
tree23b782dc06a02e200bebd528bbc9f8f28474c1e8
parent4c9f2dd08ea73cdfb303c765de2e07519bd401bc
parent8692ea7092d64826f2cc04e8d5608d71f6af03c0
Merge branch 'master' into LegendaryGuard/cyber
12 files changed:
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/replicate.qh
qcsrc/common/stats.qh
qcsrc/server/command/vote.qc
qcsrc/server/damage.qc
qcsrc/server/damage.qh
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh
qcsrc/server/world.qc