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

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

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a9c177 42d4506)

author	terencehill <piuntn@gmail.com>
	Sun, 25 Dec 2022 02:08:11 +0000 (02:08 +0000)
committer	terencehill <piuntn@gmail.com>
	Sun, 25 Dec 2022 02:08:11 +0000 (02:08 +0000)
commit	da71736a95bbb74a671107ecdeda24f2056ac3e6
tree	da9f970f3178b3d147fa71119f5d0f8e3992c59d	tree \| snapshot
parent	9a9c177923332a4fea8d3f5f01445d08d631f87c	commit \| diff
parent	42d45061115ca85e9144600e131d542dd13e464e	commit \| diff

Merge branch 'Mario/minor_fixes' into 'master'

Several fixes for minor issues

Closes #2135, #2360, #2704, #2734, #2749, and #2751

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

gamemodes-server.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	diff1 \|	diff2 \|	blob \| history