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

author	Mario <zacjardine@y7mail.com>
	Tue, 24 Mar 2015 01:30:55 +0000 (12:30 +1100)
committer	Mario <zacjardine@y7mail.com>
	Tue, 24 Mar 2015 01:30:55 +0000 (12:30 +1100)
commit	01cb4523cb4034e2bb98a96ce4bf485a84ba5ebd
tree	bb56f79e48006c4f152b798a599ea53364e4a9fe	tree \| snapshot
parent	a7d312116c36dae2334879b44bf7e2cb483ecb0b	commit \| diff
parent	8e1c65f7b42e5eb96e2bf245f8b019411d053f14	commit \| diff

Merge branch 'Mario/qc_physics_prehax' into Mario/combined_updates

Conflicts:
qcsrc/client/laser.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/vehicles/vehicles.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/nades.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/csqcmodellib/cl_player.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/race.qh
qcsrc/server/t_halflife.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/common.qc

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/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/player_skeleton.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	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/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	\|	diff2 \|	blob \| history
qcsrc/common/physics.qh	\|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/teams.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	\|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	\|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	\|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/teleport.qc	\|	diff2 \|	blob \| history
qcsrc/common/triggers/triggers.qc	\|	diff2 \|	blob \| history
qcsrc/common/triggers/triggers.qh	\|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/csqcmodellib/cl_player.qc	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_physics.qc	diff1 \|	\|	blob \| history
qcsrc/server/cl_player.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_world.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_assault.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qh	diff1 \|	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_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_infection.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_jailbreak.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_itemeditor.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_multijump.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
wtf.diff	\|	\|	blob