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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - common.pt_BR.po

author	terencehill <piuntn@gmail.com>
	Sun, 19 Mar 2023 10:59:28 +0000 (10:59 +0000)
committer	terencehill <piuntn@gmail.com>
	Sun, 19 Mar 2023 10:59:28 +0000 (10:59 +0000)
commit	1723207cf6ba96a8cb9d3063f588d2df56c70c45
tree	0c61db7ae8e1ad9b47e3d481a9d0c6296556f090	tree \| snapshot
parent	f8e1a6ccf8b7400d1041638bac1aef9a428a4142	commit \| diff
parent	d9dff3313338091745ef2c740eca17b9574a67ee	commit \| diff

Merge branch 'terencehill/decals_fix' into 'master'

Fix 2 decal issues

Closes #2128

See merge request xonotic/xonotic-data.pk3dir!1127

qcsrc/common/effects/qc/damageeffects.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/okhmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/oknex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/okrpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history