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	Mario <zacjardine@y7mail.com>
	Fri, 24 Apr 2015 05:20:09 +0000 (15:20 +1000)
committer	Mario <zacjardine@y7mail.com>
	Fri, 24 Apr 2015 05:20:09 +0000 (15:20 +1000)
commit	e0f9af3dbd5b221c7b95e0dac5e723466d32beee
tree	fa968646d90fccca4be1aaadb95ef0b4902e926a	tree \| snapshot
parent	c8597f89bb8bc759dbcf163fab4fc6b4df552dbb	commit \| diff
parent	1aac6cbd00e98ca537937fdc9490216a50cf3caa	commit \| diff

Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/monsters/sv_monsters.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/t_plats.qc
qcsrc/server/target_music.qc
qcsrc/server/tturrets/include/turrets_early.qh
qcsrc/server/tturrets/system/system_damage.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/bumblebee.qh
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/vehicles.qc

67 files changed:

qcsrc/common/monsters/monster/ogre.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/button.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/multi.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qh	diff1 \|	\|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_flak.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_lightsabre.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vortex.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/cl_player.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	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/jeff.qc	diff1 \|	\|	blob \| history
qcsrc/server/jeff.qh	diff1 \|	\|	blob \| history
qcsrc/server/miscfunctions.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/mutators/mutator_physical_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/common/monsters/monster/ogre.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/button.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/multi.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qh	diff1 \|	\|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_flak.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_lightsabre.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vortex.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/cl_player.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	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/jeff.qc	diff1 \|	\|	blob \| history
qcsrc/server/jeff.qh	diff1 \|	\|	blob \| history
qcsrc/server/miscfunctions.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/mutators/mutator_physical_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history