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	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 11 Oct 2015 22:38:36 +0000 (09:38 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 11 Oct 2015 22:39:59 +0000 (09:39 +1100)
commit	437d67dbc7631d6c49e922990d96461d3ff4b7b2
tree	b5c66c3bbaf04cf4ecfb05954107cb2073bb9d7b	tree \| snapshot
parent	9231345bfc303d3e7d9bd8a2df62e5aa26327638	commit \| diff
parent	3ae1efa7401791e42e3171f4db2cc2d38adde088	commit \| diff

Merge branch 'master' into TimePath/deathtypes

# Conflicts:
# qcsrc/client/damage.qc
# qcsrc/client/hud.qc
# qcsrc/client/main.qc
# qcsrc/client/progs.inc
# qcsrc/common/vehicles/vehicle/raptor_weapons.qc
# qcsrc/common/weapons/all.qc
# qcsrc/server/cheats.qc
# qcsrc/server/g_world.qc
# qcsrc/server/teamplay.qc

53 files changed:

qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.inc	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/monster/zombie.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/instagib.qc	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/misc/laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/raptor_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_bloodloss.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_breakablehook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_campcheck.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_rocketminsta.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.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/weapons/common.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.inc	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/monster/zombie.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/instagib.qc	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/misc/laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/raptor_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_bloodloss.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_breakablehook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_campcheck.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_rocketminsta.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.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/weapons/common.qc	diff1 \|	diff2 \|	blob \| history