Merge branch 'wolf-model-fix' into 'master'

Wolf model assets update

See merge request veloren/veloren!181

Former-commit-id: d8d53f5b8993c13a1c6eae1588c4f2abc882856d

voxygen/src/anim/quadrupedmedium/idle.rs

@@ -72,15 +72,15 @@ impl Animation for IdleAnimation {
             * Quaternion::rotation_x(wolf_tail.y);
         next.wolf_tail.scale = Vec3::one() / 11.0;
 
-        next.wolf_torsoback.offset = Vec3::new(0.0, -9.5, 11.0 + wave_ultra_slow * 1.2) / 11.0;
+        next.wolf_torsoback.offset = Vec3::new(0.0, -11.7, 11.0 + wave_ultra_slow * 1.2) / 11.0;
         next.wolf_torsoback.ori = Quaternion::rotation_y(wave_slow_cos * 0.015);
         next.wolf_torsoback.scale = Vec3::one() / 11.0;
 
         next.wolf_torsomid.offset = Vec3::new(0.0, 0.0, 12.0 + wave_ultra_slow * 0.7) / 11.0;
         next.wolf_torsomid.ori = Quaternion::rotation_y(wave_slow * 0.015);
-        next.wolf_torsomid.scale = Vec3::one() / 10.9;
+        next.wolf_torsomid.scale = Vec3::one() / 10.5;
 
-        next.wolf_ears.offset = Vec3::new(0.0, 0.75, 6.25);
+        next.wolf_ears.offset = Vec3::new(0.0, 0.75, 5.25);
         next.wolf_ears.ori = Quaternion::rotation_x(0.0 + wave_slow * 0.1);
         next.wolf_ears.scale = Vec3::one() * 1.05;
 

voxygen/src/anim/quadrupedmedium/jump.rs

@@ -53,7 +53,7 @@ impl Animation for JumpAnimation {
 
         next.wolf_torsomid.offset = Vec3::new(0.0, 0.0, 12.0 + wave_stop * 3.6) / 11.0;
         next.wolf_torsomid.ori = Quaternion::rotation_x(wave_slow * -0.25);
-        next.wolf_torsomid.scale = Vec3::one() / 10.9;
+        next.wolf_torsomid.scale = Vec3::one() / 10.5;
 
         next.wolf_ears.offset = Vec3::new(0.0, 0.75, 6.25);
         next.wolf_ears.ori = Quaternion::rotation_x(0.0);

voxygen/src/anim/quadrupedmedium/run.rs

@@ -85,7 +85,7 @@ impl Animation for RunAnimation {
         next.wolf_torsomid.offset =
             Vec3::new(0.0, 0.0 + wave_quick_cos * 2.2, 14.0 + wave_med * 3.2) / 11.0;
         next.wolf_torsomid.ori = Quaternion::rotation_x(-0.15 + wave_med_cos * 0.12);
-        next.wolf_torsomid.scale = Vec3::one() / 10.9;
+        next.wolf_torsomid.scale = Vec3::one() / 10.5;
 
         next.wolf_ears.offset = Vec3::new(0.0, 0.75 + wave * 0.4, 6.25);
         next.wolf_ears.ori = Quaternion::rotation_x(wave * 0.2);

voxygen/src/hud/settings_window.rs

@@ -324,6 +324,7 @@ impl<'a> Widget for SettingsWindow<'a> {
             Toggle Interface\n\
             Toggle FPS and Debug Info\n\
             Take Screenshot\n\
+            Toggle Nametags\n\
             Toggle Fullscreen\n\
             \n\
             \n\
@@ -334,6 +335,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             \n\
             Jump\n\
             \n\
+            Glider
+            \n\
             Dodge\n\
             \n\
             Auto Walk\n\
@@ -342,6 +345,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             \n\
             Put on/Remove Helmet\n\
             \n\
+            Sit\n\
+            \n\
             \n\
             Basic Attack\n\
             Secondary Attack/Block/Aim\n\
@@ -377,7 +382,14 @@ impl<'a> Widget for SettingsWindow<'a> {
             Chat commands:  \n\
             \n\
             /alias [Name] - Change your Chat Name   \n\
-            /tp [Name] - Teleports you to another player
+            /tp [Name] - Teleports you to another player    \n\
+            /jump <dx> <dy> <dz> - Offset your position \n\
+            /goto <x> <y> <z> - Teleport to a position  \n\
+            /tp <name> - Teleport to another player \n\
+            /kill - Kill yourself   \n\
+            /pig - Spawn pig NPC    \n\
+            /wolf - Spawn wolf NPC  \n\
+            /help - Display chat commands
             ",
             )
             .color(TEXT_COLOR)
@@ -392,6 +404,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                  F2\n\
                  F3\n\
                  F4\n\
+                 F6\n\
                  F11\n\
                  \n\
                  \n\
@@ -402,6 +415,10 @@ impl<'a> Widget for SettingsWindow<'a> {
                  \n\
                  SPACE\n\
                  \n\
+                 L-Shift\n\
+                 \n\
+                 ??\n\
+                 \n\
                  ??\n\
                  \n\
                  ??\n\