]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <theasixchan777@gmail.com>
Mon, 12 Jul 2021 18:45:03 +0000 (20:45 +0200)
committerLegendaryGuard <theasixchan777@gmail.com>
Mon, 12 Jul 2021 18:45:03 +0000 (20:45 +0200)
commit068cb71feb4e85472715e80df232b09142606bbc
tree04e40d858595da9aafe92a3746464772fafff546
parent6318d18e8f5e36670d2af630cb744cffae849511
parent3d8458f8a06c93927837df897849824528c2df8d
Merge branch 'master' into LegendaryGuard/cyber
29 files changed:
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/state.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/damage.qc
qcsrc/server/damage.qh
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/world.qc