de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mutators/mutator/sandbox/sv

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc

Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc

qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/golem.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/projectiles.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history