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

author	TimePath <andrew.hardaker1995@gmail.com>
	Thu, 10 Mar 2016 06:35:55 +0000 (17:35 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Thu, 10 Mar 2016 06:39:13 +0000 (17:39 +1100)
commit	9f70bdba9a6fb2c06324be13504341da967f7028
tree	bef9296e1906d3b5f6ae22e4358b22daffc06832	tree \| snapshot
parent	6e7fae90a84673482a986aa83a6b618fb23c7eb5	commit \| diff
parent	f6aef4f937fde258e3cd8c7a05f7deb908a044c8	commit \| diff

Merge branch 'master' into TimePath/notifications

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/hmg.qc
# qcsrc/common/mutators/mutator/overkill/rpc.qc
# qcsrc/common/weapons/weapon/arc.qc
# qcsrc/common/weapons/weapon/blaster.qc
# qcsrc/common/weapons/weapon/crylink.qc
# qcsrc/common/weapons/weapon/devastator.qc
# qcsrc/common/weapons/weapon/electro.qc
# qcsrc/common/weapons/weapon/fireball.qc
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/common/weapons/weapon/hlac.qc
# qcsrc/common/weapons/weapon/hook.qc
# qcsrc/common/weapons/weapon/machinegun.qc
# qcsrc/common/weapons/weapon/minelayer.qc
# qcsrc/common/weapons/weapon/mortar.qc
# qcsrc/common/weapons/weapon/rifle.qc
# qcsrc/common/weapons/weapon/seeker.qc
# qcsrc/common/weapons/weapon/shockwave.qc
# qcsrc/common/weapons/weapon/shotgun.qc
# qcsrc/common/weapons/weapon/vaporizer.qc
# qcsrc/common/weapons/weapon/vortex.qc

34 files changed:

qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/campcheck/campcheck.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/campcheck/campcheck.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history