de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/player.qc

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/player.qc

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 824dde5 2ad7a79)

author	bones_was_here <bones_was_here@xa.org.au>
	Sun, 18 Oct 2020 11:18:12 +0000 (21:18 +1000)
committer	bones_was_here <bones_was_here@xa.org.au>
	Sun, 18 Oct 2020 11:18:12 +0000 (21:18 +1000)
commit	d24e46b65c1fe73fae4cf8034f4e7f318a17053a
tree	a5934e7175813cec94c21fa6f5aece82828fa375	tree \| snapshot
parent	824dde5a5388816a57e8a9897b3b612a380a482c	commit \| diff
parent	2ad7a79250d682efda53246cb74df7cf7d55dd82	commit \| diff

Merge branch 'master' into bones_was_here/q3compat

18 files changed:

qcsrc/common/mapobjects/func/door.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics/player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/spawnfunc.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/warpzone/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/compat/quake.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/compat/quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/spawning.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/spawning.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history