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>
	Sun, 1 Nov 2015 11:17:03 +0000 (22:17 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 1 Nov 2015 11:17:03 +0000 (22:17 +1100)
commit	b683bf23a495d3b1b3f6df3bda75bfe0f069ab05
tree	8ccf1ccb9fdfae29c061bb9c4c746b88aabbd899	tree \| snapshot
parent	cd141fba8a7c59fef4b0e98eee651943b18cd99d	commit \| diff
parent	3f01af4a3f5d694062231a5ab86aea9f22ce0142	commit \| diff

Merge branch 'master' into TimePath/debug_draw

# Conflicts:
# qcsrc/common/effects/all.qc
# qcsrc/lib/net.qh

45 files changed:

qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/generator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/gibs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/effect.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/cl_minigames.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/sv_minigames.qh	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/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/cl_turrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	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/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/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.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/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/net.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/warpzone/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.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/mutators/mutator/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/generator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/gibs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/effect.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/cl_minigames.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/sv_minigames.qh	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/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/cl_turrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	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/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/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.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/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/net.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/warpzone/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.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/mutators/mutator/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history