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

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

Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/progs.src

24 files changed:

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qc	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/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/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weapons.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_assault.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/progs.src	diff1 \|	diff2 \|	blob \| history

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qc	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/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/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weapons.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_assault.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/progs.src	diff1 \|	diff2 \|	blob \| history