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

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

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

author	Samual Lenks <samual@xonotic.org>
	Thu, 5 Sep 2013 18:19:01 +0000 (14:19 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Thu, 5 Sep 2013 18:19:01 +0000 (14:19 -0400)
commit	3c7ef5b449d479f9a2e24fdddf767f87208c9be6
tree	6136b97f3612154ce70dcb01db671245f3b88228	tree \| snapshot
parent	79355d207a08f4f1b9c87c3235427316a71e948f	commit \| diff
parent	ed99b61f2c856b4ad3b92af63021256e3ce69fb4	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/client/hook.qc
qcsrc/common/constants.qh
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/weapons.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/t_items.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_uzi.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc

51 files changed:

balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
oldbalanceXPM.cfg	diff1 \|	\|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_electro.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_fireball.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_hook.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_seeker.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_shockwave.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qh	diff1 \|	\|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_impulse.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/func_breakable.qc	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_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nix.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	\|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/raptor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/spawning.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/throwing.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	\|	blob \| history

RSS Atom

balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
oldbalanceXPM.cfg	diff1 \|	\|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_electro.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_fireball.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_hook.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_seeker.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_shockwave.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qh	diff1 \|	\|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_impulse.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/func_breakable.qc	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_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_minstagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nix.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	\|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/raptor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/spawning.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/throwing.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	\|	blob \| history