remove warnings, rebase fix

common/src/sys/agent.rs

@@ -4,7 +4,7 @@ use crate::{
         agent::Activity,
         item::{tool::ToolKind, ItemKind},
         Agent, Alignment, CharacterState, ChatMsg, ControlAction, Controller, Loadout, MountState,
-        Ori, Pos, Scale, Stats,
+        Ori, Pos, Scale, Stats, Vel,
     },
     event::{EventBus, ServerEvent},
     path::Chaser,

voxygen/src/anim/src/quadruped_low/jump.rs

@@ -1,5 +1,4 @@
 use super::{super::Animation, QuadrupedLowSkeleton, SkeletonAttr};
-use std::f32::consts::PI;
 use vek::*;
 
 pub struct JumpAnimation;

voxygen/src/anim/src/quadruped_low/run.rs

@@ -1,5 +1,5 @@
 use super::{super::Animation, QuadrupedLowSkeleton, SkeletonAttr};
-use std::{f32::consts::PI, ops::Mul};
+use std::f32::consts::PI;
 use vek::*;
 
 pub struct RunAnimation;

voxygen/src/scene/figure/mod.rs

@@ -985,7 +985,7 @@ impl FigureMgr {
                         (false, _, false) => {
                             anim::quadruped_medium::JumpAnimation::update_skeleton(
                                 &QuadrupedMediumSkeleton::new(),
-                                (time),
+                                time,
                                 state.state_time,
                                 &mut state_animation_rate,
                                 skeleton_attr,