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>
	Mon, 15 Dec 2014 09:57:03 +0000 (20:57 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Mon, 15 Dec 2014 10:00:18 +0000 (21:00 +1100)
commit	6eb688299155b424dd40969b366922f8ceff0a1b
tree	3f2163d7245acf6e14a6dd2f07579b88d6121f7f	tree \| snapshot
parent	00769f24223cce1a25f8a32f3eb29301b9eae0c5	commit \| diff

digging out gamemode infection by fruitieX

(cherry picked from commit 4644e4cdda0033c7db72a7ec5c65cdd3f4c8d654)

Conflicts:
gamemodes.cfg
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src

16 files changed:

gamemodes.cfg		diff \| blob \| history
qcsrc/client/hud.qc		diff \| blob \| history
qcsrc/common/mapinfo.qc		diff \| blob \| history
qcsrc/common/mapinfo.qh		diff \| blob \| history
qcsrc/menu/xonotic/util.qc		diff \| blob \| history
qcsrc/server/autocvars.qh		diff \| blob \| history
qcsrc/server/bot/aim.qc		diff \| blob \| history
qcsrc/server/bot/bot.qc		diff \| blob \| history
qcsrc/server/cl_client.qc		diff \| blob \| history
qcsrc/server/cl_player.qc		diff \| blob \| history
qcsrc/server/defs.qh		diff \| blob \| history
qcsrc/server/g_damage.qc		diff \| blob \| history
qcsrc/server/mutators/gamemode_infection.qc	[new file with mode: 0644]	blob
qcsrc/server/mutators/mutators.qh		diff \| blob \| history
qcsrc/server/mutators/mutators_include.qc		diff \| blob \| history
qcsrc/server/teamplay.qc		diff \| blob \| history

RSS Atom