git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge branch 'master' into Mario/overkill

26 files changed:

balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceFruitieX.cfg	diff1 \|	diff2 \|	blob \| history
balanceXDF.cfg	diff1 \|	diff2 \|	blob \| history
balanceXPM.cfg	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
overkill.cfg	diff1 \|	\|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_overkill.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hmg.qc	diff1 \|	\|	blob \| history
qcsrc/server/w_rpc.qc	diff1 \|	\|	blob \| history

balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceFruitieX.cfg	diff1 \|	diff2 \|	blob \| history
balanceXDF.cfg	diff1 \|	diff2 \|	blob \| history
balanceXPM.cfg	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
overkill.cfg	diff1 \|	\|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_overkill.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hmg.qc	diff1 \|	\|	blob \| history
qcsrc/server/w_rpc.qc	diff1 \|	\|	blob \| history