more rebasing

Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf

voxygen/src/anim/character/idle.rs

@@ -30,6 +30,7 @@ impl Animation for IdleAnimation {
         let wavecos_slow = (time as f32 * 6.0 + PI).cos();
         let waveultra_slow = (time as f32 * 1.0 + PI).sin();
         let waveultracos_slow = (time as f32 * 1.0 + PI).cos();
+
         let wave_dip = (wave_slow.abs() - 0.5).abs();
 
         next.head.offset = Vec3::new(0.0, 0.0, 12.0 + waveultra_slow * 0.4) / SCALE;

voxygen/src/anim/character/run.rs

@@ -46,7 +46,6 @@ impl Animation for RunAnimation {
         next.r_hand.offset = Vec3::new(0.0 + wavecos * 1.0, -7.5, 11.0 + wave * 1.0) / SCALE;
         next.r_hand.ori = Quaternion::rotation_y(wave * 1.8);
 
-
         next.l_foot.offset = Vec3::new(2.5 - wavecos * 4.0, 3.4, 6.0 + wave * 2.9) / SCALE;
         next.l_foot.ori = Quaternion::rotation_y(wave * -1.0);
         next.r_foot.offset = Vec3::new(2.5 + wavecos * 4.0, -3.4, 6.0 - wave * 2.9) / SCALE;

voxygen/src/scene/figure.rs

@@ -53,6 +53,7 @@ impl Figures {
         }
 
         let bone_meshes = [
+
             Some(load_segment("head.vox").generate_mesh(Vec3::new(-3.5, -7.0, -6.0))),
             Some(load_segment("chest.vox").generate_mesh(Vec3::new(-3.0, -6.0, 0.0))),
             Some(load_segment("belt.vox").generate_mesh(Vec3::new(-3.0, -5.0, 0.0))),