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

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

author	LegendaryGuard <rootuser999@gmail.com>
	Wed, 5 Jan 2022 18:18:09 +0000 (19:18 +0100)
committer	LegendaryGuard <rootuser999@gmail.com>
	Wed, 5 Jan 2022 18:18:09 +0000 (19:18 +0100)
commit	ea7a3b717331f01a459bf8e19a6ae259987a8fe2
tree	513d898078b9e53b172a01348265bfe6acac1fef	tree \| snapshot
parent	75c25d1b4419d70d6977ada82b30f2763f19a623	commit \| diff
parent	e485bcaeede5f929c1ceefa26a51da840c2f1a1e	commit \| diff

Merge branch 'master' into LegendaryGuard/cyber

23 files changed:

qcsrc/client/hud/panel/timer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/replicate.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history

qcsrc/client/hud/panel/timer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/replicate.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history