de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

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

author	Rudolf Polzer <divverent@xonotic.org>
	Thu, 25 Sep 2014 16:22:31 +0000 (18:22 +0200)
committer	Rudolf Polzer <divverent@xonotic.org>
	Thu, 25 Sep 2014 16:22:31 +0000 (18:22 +0200)
commit	d6e1aa437e7eb8e182053cf17231597e79df0f81
tree	211cf21455394c794f44c1e957d0332734e8e6bf	tree \| snapshot
parent	dccfc3eef40ca210167d43bb30fae6bb116e12f0	commit \| diff
parent	3f1297c955ff567121bee040ee94f5b4022d046f	commit \| diff

Merge branch 'master' into samual/weapons

Conflicts:
balanceXonotic.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/t_items.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/weapons/weaponsystem.qc

35 files changed:

balance-xonotic.cfg	diff1 \|	\|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
oldbalance25.cfg	diff1 \|	\|	blob \| history
oldbalanceFruitieX.cfg	diff1 \|	\|	blob \| history
oldbalanceXDF.cfg	diff1 \|	\|	blob \| history
oldbalanceXPM.cfg	diff1 \|	\|	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/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.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/weapons/w_minelayer.qc	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.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/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	\|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/hitplot.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	\|	blob \| history

RSS Atom

balance-xonotic.cfg	diff1 \|	\|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
oldbalance25.cfg	diff1 \|	\|	blob \| history
oldbalanceFruitieX.cfg	diff1 \|	\|	blob \| history
oldbalanceXDF.cfg	diff1 \|	\|	blob \| history
oldbalanceXPM.cfg	diff1 \|	\|	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/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.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/weapons/w_minelayer.qc	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.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/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	\|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/hitplot.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	\|	blob \| history