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	Mario <zacjardine@y7mail.com>
	Fri, 14 Nov 2014 02:05:18 +0000 (13:05 +1100)
committer	Mario <zacjardine@y7mail.com>
	Fri, 14 Nov 2014 02:05:18 +0000 (13:05 +1100)
commit	2b89f5bdd3be253aa44320dc71f70f283df3b5ee
tree	93fc3231c42b8a33a6b90c6a19bc3e85549c2cf6	tree \| snapshot
parent	fff8ca8a8ef9a10324d8ebd660da0d6a3ff5a658	commit \| diff
parent	26f74fde4b86df999a01be07a6b78adf8e00a88c	commit \| diff

Merge branch 'master' into Mario/weapons

Conflicts:
mutators.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/w_electro.qc
qcsrc/server/w_minelayer.qc

39 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
mutators.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	\|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_arc.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_minelayer.qc	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/aim.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/roles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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/base.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/csqcprojectile.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	\|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
mutators.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	\|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_arc.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_minelayer.qc	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/aim.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/roles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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/base.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/csqcprojectile.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	\|	blob \| history