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, 21 Aug 2015 08:55:37 +0000 (18:55 +1000)
committer	Mario <zacjardine@y7mail.com>
	Fri, 21 Aug 2015 08:55:37 +0000 (18:55 +1000)
commit	ae2c1407ec9a05e4f501a6604a7cce8e1030df9f
tree	e10e482edc25bc10bdab547107310ec7d5e6f5c7	tree \| snapshot
parent	ad415a3b4e5ec559b143c81080dd705875533449	commit \| diff
parent	8b38ad6987192a2129a7aa55410fd6d729425a28	commit \| diff

Merge branch 'master' into Mario/vehicles

# Conflicts:
# qcsrc/client/autocvars.qh
# qcsrc/client/main.qc
# qcsrc/client/tturrets.qc
# qcsrc/client/vehicles/all.qc
# qcsrc/server/g_world.qc
# qcsrc/server/vehicles/bumblebee.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/raptor.qc
# qcsrc/server/vehicles/spiderbot.qc
# qcsrc/server/vehicles/vehicle.qc
# qcsrc/server/vehicles/vehicle.qh

45 files changed:

qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/tturrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/all.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/all.qh	\|	\|	blob
qcsrc/common/vehicles/unit/bumblebee.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/raptor.qh	\|	\|	blob
qcsrc/common/vehicles/unit/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qh	diff1 \|	\|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_impulse.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.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/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history
vehicles.cfg	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/tturrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/all.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/all.qh	\|	\|	blob
qcsrc/common/vehicles/unit/bumblebee.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/raptor.qh	\|	\|	blob
qcsrc/common/vehicles/unit/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qh	diff1 \|	\|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_impulse.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.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/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history
vehicles.cfg	diff1 \|	diff2 \|	blob \| history