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>
	Tue, 17 Feb 2015 19:45:21 +0000 (06:45 +1100)
committer	Mario <zacjardine@y7mail.com>
	Tue, 17 Feb 2015 19:45:21 +0000 (06:45 +1100)
commit	6dc9591eba337374f2b4348a6a6deaa1cb6887d0
tree	0fb5431c4ad362658e7c388e009fa5404e0225f6	tree \| snapshot
parent	28368f51696277dc00533de59defa97c790b77d5	commit \| diff
parent	4e85c153239969d8dccea38031e18ddb24b6c935	commit \| diff

Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

Conflicts:
qcsrc/client/bgmscript.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/damage.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/physics.qh
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/spawn.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/secret.qc
qcsrc/common/triggers/trigger/secret.qh
qcsrc/common/triggers/trigger/swamp.qc
qcsrc/server/constants.qh
qcsrc/server/g_subs.qc
qcsrc/server/g_triggers.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/t_halflife.qc
qcsrc/server/t_plats.qc

84 files changed:

qcsrc/client/bgmscript.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/bgmscript.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/effects.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	\|	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/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/net_notice.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/conveyor.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/ladder.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/plat.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/rainsnow.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/train.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/laser.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/platforms.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/platforms.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/subs.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qh	\|	\|	blob
qcsrc/common/triggers/target/spawn.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/gravity.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/hurt.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/impulse.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/impulse.qh	\|	\|	blob
qcsrc/common/triggers/trigger/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/magicear.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qh	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_porto.qc	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_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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_subs.qh	\|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_domination.qc	diff1 \|	diff2 \|	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_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/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_jumppads.qh	\|	diff2 \|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_misc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/bgmscript.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/bgmscript.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/effects.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	\|	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/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/net_notice.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/conveyor.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/ladder.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/plat.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/rainsnow.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/func/train.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/misc/laser.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/platforms.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/platforms.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/subs.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/target/music.qh	\|	\|	blob
qcsrc/common/triggers/target/spawn.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/gravity.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/hurt.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/impulse.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/impulse.qh	\|	\|	blob
qcsrc/common/triggers/trigger/include.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/include.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/magicear.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/secret.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/trigger/swamp.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qh	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_porto.qc	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_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	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_subs.qh	\|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_domination.qc	diff1 \|	diff2 \|	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_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/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_jumppads.qh	\|	diff2 \|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/system/system_misc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/server.qc	diff1 \|	diff2 \|	blob \| history