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	Samual Lenks <samual@xonotic.org>
	Fri, 6 Dec 2013 21:13:30 +0000 (16:13 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Fri, 6 Dec 2013 21:13:30 +0000 (16:13 -0500)
commit	0ee74987765518ffed584a790f90607c3f3f8e71
tree	60d1d838988312a3b0e01908370b81b82d1fd4a3	tree \| snapshot
parent	1617a82857a149add8665e9a8a3e216f91304d2c	commit \| diff
parent	ad8f3ce1398d7fa2204c0282b1d0f84838ca0e92	commit \| diff

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

Conflicts:
balanceXonotic.cfg
qcsrc/common/weapons/w_seeker.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/tturrets/units/unit_machinegun.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_uzi.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc

55 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/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	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_seeker.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_tuba.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qh	diff1 \|	\|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	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/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_flac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_machinegun.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/accuracy.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/csqcprojectile.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/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	\|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	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_seeker.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_tuba.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapons.qh	diff1 \|	\|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	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/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_flac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_machinegun.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/accuracy.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/csqcprojectile.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	\|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	\|	blob \| history