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

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

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

author	Mario <zacjardine@y7mail.com>
	Wed, 8 Jul 2015 14:15:25 +0000 (00:15 +1000)
committer	Mario <zacjardine@y7mail.com>
	Wed, 8 Jul 2015 14:15:25 +0000 (00:15 +1000)
commit	125d619e9ab2a307b15b7ee1a2ededed32c7e84d
tree	84af2d7d2fe0909b723fa2db868a4fff6dcc3633	tree \| snapshot
parent	e728fc245c92d692c4e51936ad42bc8a1d4eeb6c	commit \| diff
parent	8751feffa227c3d12ce6a7c957170726bbf79625	commit \| diff

Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

80 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/bgmscript.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/casings.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/effects.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/gibs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/player_skeleton.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/t_items.qc	\|	diff2 \|	blob \| history
qcsrc/client/tturrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/vehicles/all.qc	\|	diff2 \|	blob \| history
qcsrc/client/vehicles/bumblebee.qc	\|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	\|	blob \| history
qcsrc/common/physics.qh	diff1 \|	\|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/pointparticles.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/spawn.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qh	diff1 \|	\|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	\|	diff2 \|	blob \| history
qcsrc/dpdefs/upstream/csprogsdefs.qc	\|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/navigation.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/waypoints.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_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/radarmap.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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_models.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_subs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_multijump.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/pathlib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_plats.qc	\|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicle.qh	\|	diff2 \|	blob \| history
qcsrc/server/weapons/hitplot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/throwing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/util_server.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/bgmscript.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/casings.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/effects.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/gibs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/player_skeleton.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/t_items.qc	\|	diff2 \|	blob \| history
qcsrc/client/tturrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/vehicles/all.qc	\|	diff2 \|	blob \| history
qcsrc/client/vehicles/bumblebee.qc	\|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	\|	blob \| history
qcsrc/common/physics.qh	diff1 \|	\|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/pointparticles.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/spawn.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/teleporters.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qh	diff1 \|	\|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	\|	diff2 \|	blob \| history
qcsrc/dpdefs/upstream/csprogsdefs.qc	\|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/navigation.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/waypoints.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_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/radarmap.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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_models.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_subs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_multijump.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/pathlib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_plats.qc	\|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicle.qh	\|	diff2 \|	blob \| history
qcsrc/server/weapons/hitplot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/throwing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/util_server.qc	diff1 \|	diff2 \|	blob \| history