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

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

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

author	Mario <mario.mario@y7mail.com>
	Fri, 30 Aug 2013 11:04:40 +0000 (21:04 +1000)
committer	Mario <mario.mario@y7mail.com>
	Fri, 30 Aug 2013 11:04:40 +0000 (21:04 +1000)
commit	1f988ad58a9fb5cef7ed843ad839b23dd23f6dc9
tree	cbada282aa41db5e6f17149312979dbba5d0dcb0	tree \| snapshot
parent	4a093a902aba2c36a30bcef342628d432e79b2f2	commit \| diff
parent	1b130c7ceb9f035ba250a879967d8356552bb914	commit \| diff

Merge branch 'master' into Mario/monsters

38 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/brute.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/knight.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/slime.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/zombie.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	\|	blob \| history
qcsrc/common/notifications.qh	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/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weaponsystem.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/generator.qc	diff1 \|	\|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/brute.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/knight.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/slime.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/zombie.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	\|	blob \| history
qcsrc/common/notifications.qh	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/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weaponsystem.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/generator.qc	diff1 \|	\|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history