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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 711394d 1b9c5a5)

author	LegendaryGuard <rootuser999@gmail.com>
	Sun, 21 May 2023 10:14:28 +0000 (12:14 +0200)
committer	LegendaryGuard <rootuser999@gmail.com>
	Sun, 21 May 2023 10:14:28 +0000 (12:14 +0200)
commit	68893cee24dc4dfbf66e3c4f501a7091be6480d1
tree	ee124e1bf8186047d9821306183d882f129e42e0	tree \| snapshot
parent	711394d17ba14dc17a5654665f3632f99a543068	commit \| diff
parent	1b9c5a52099d847b13289e56be9e7888c9e03607	commit \| diff

Merge branch 'pending-release' into LegendaryGuard/rename_weapon_filenames

19 files changed:

models/weapons/h_ok_nex.iqm	diff1 \|	\|	blob \| history
models/weapons/h_ok_rpc.iqm	diff1 \|	\|	blob \| history
models/weapons/h_ok_rpc.iqm.framegroups	diff1 \|	\|	blob \| history
models/weapons/v_devastator.md3	diff1 \|	\|	blob \| history
models/weapons/v_vortex.md3	diff1 \|	\|	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.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qh	diff1 \|	diff2 \|	blob \| history