git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	Mario <zacjardine@y7mail.com>
	Fri, 1 May 2015 11:55:49 +0000 (21:55 +1000)
committer	Mario <zacjardine@y7mail.com>
	Fri, 1 May 2015 11:55:49 +0000 (21:55 +1000)
commit	117fa45380851579df9e6c465a207d733f6ca748
tree	2f5f5a597f2ea16983fda06f294f58530f613b6f	tree \| snapshot
parent	b5dca4b47b21014868e29fbbd510c9fa735f7fde	commit \| diff
parent	51556c68ea3024fc22a9a38e0d0d72e5107e2d60	commit \| diff

Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/t_plats.qc
qcsrc/server/target_music.qc

27 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.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_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_models.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/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_misc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.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_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_models.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/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_misc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history