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, 21 Aug 2016 04:44:45 +0000 (14:44 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 21 Aug 2016 04:45:23 +0000 (14:45 +1000)
commit	4ee2807b2d8f808928ef14b3e814945b3edb4350
tree	8d2410a1271cfc92ce4744e108463e243a25a8fb	tree \| snapshot
parent	79eebf87e68861e205a8754d6551bd0aa2229c44	commit \| diff
parent	8a070bbd42eac0b8b1ec9fac24f5de08b85461d3	commit \| diff

Merge branch 'master' into TimePath/modules

# Conflicts:
# qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
# qcsrc/common/mutators/mutator/campcheck/campcheck.qc
# qcsrc/server/mutators/mutator/gamemode_domination.qh

22 files changed:

qcsrc/client/hud/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/powerups.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc	diff1 \|	\|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh	diff1 \|	\|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc	diff1 \|	\|	blob \| history
qcsrc/common/mutators/mutator/itemstime/itemstime.qc	diff1 \|	\|	blob \| history
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc	diff1 \|	\|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.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/events.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_domination.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	\|	blob \| history
qcsrc/server/player.qh	diff1 \|	\|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/hud/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/powerups.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc	diff1 \|	\|	blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh	diff1 \|	\|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc	diff1 \|	\|	blob \| history
qcsrc/common/mutators/mutator/itemstime/itemstime.qc	diff1 \|	\|	blob \| history
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc	diff1 \|	\|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.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/events.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_domination.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	\|	blob \| history
qcsrc/server/player.qh	diff1 \|	\|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history