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, 29 Nov 2015 02:45:20 +0000 (13:45 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 29 Nov 2015 02:46:37 +0000 (13:46 +1100)
commit	1cbef966e133966c5b5f0f5b58fbd1a5851ed35b
tree	1110ddfcb697634ed7e0dd3873a1e3cb01fc9f04	tree \| snapshot
parent	229104225e03b92717b3b2760e6b6d2c5a2cddfe	commit \| diff
parent	fefc5a02e121922a89f680daf3ad58259896f174	commit \| diff

Merge branch 'master' into TimePath/stats

# Conflicts:
# qcsrc/client/hud/panel/ammo.qc
# qcsrc/client/hud/panel/powerups.qc
# qcsrc/client/view.qc
# qcsrc/common/mutators/mutator/nades/nades.qc
# qcsrc/common/physics.qc
# qcsrc/common/physics.qh
# qcsrc/common/weapons/weapon/vortex.qc
# qcsrc/lib/registry.qh
# qcsrc/lib/stats.qh

34 files changed:

qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/ammo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/powerups.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/all.qh	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/module.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qh	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/csprogsdefs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/registry.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.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.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/ammo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/powerups.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/all.qh	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/module.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qh	\|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/csprogsdefs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/registry.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.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.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history