From 8a3b30822460f0244d349da14440be21a41e8be4 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 26 May 2019 19:12:32 +0000 Subject: [PATCH] Wolf model assets update Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd --- .../voxygen/voxel/figure/body/pants_male.vox | 4 ++-- assets/voxygen/voxel/npc/wolf/wolf_ears.vox | 4 ++-- assets/voxygen/voxel/npc/wolf/wolf_jaw.vox | 4 ++-- .../voxygen/voxel/npc/wolf/wolf_lb_foot.vox | 4 ++-- .../voxygen/voxel/npc/wolf/wolf_lf_foot.vox | 4 ++-- .../voxel/npc/wolf/wolf_lower_head.vox | 4 ++-- .../voxygen/voxel/npc/wolf/wolf_rb_foot.vox | 4 ++-- .../voxygen/voxel/npc/wolf/wolf_rf_foot.vox | 4 ++-- assets/voxygen/voxel/npc/wolf/wolf_tail.vox | 4 ++-- .../voxel/npc/wolf/wolf_torso_back.vox | 4 ++-- .../voxygen/voxel/npc/wolf/wolf_torso_mid.vox | 4 ++-- .../voxel/npc/wolf/wolf_upper_head.vox | 4 ++-- voxygen/src/anim/quadrupedmedium/idle.rs | 6 +++--- voxygen/src/anim/quadrupedmedium/jump.rs | 2 +- voxygen/src/anim/quadrupedmedium/run.rs | 2 +- voxygen/src/hud/settings_window.rs | 19 ++++++++++++++++++- 16 files changed, 47 insertions(+), 30 deletions(-) diff --git a/assets/voxygen/voxel/figure/body/pants_male.vox b/assets/voxygen/voxel/figure/body/pants_male.vox index 6b9cc921a4..a76a298be2 100644 --- a/assets/voxygen/voxel/figure/body/pants_male.vox +++ b/assets/voxygen/voxel/figure/body/pants_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:774c12f48276f92b14262f6bb2720986a2d409bf9b51d5e4146b413ee4ca6caf -size 44719 +oid sha256:2486a04a6facfb002c0a504a1b6c138190df93e0b3a3a62da267c8c3f43dade7 +size 44831 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_ears.vox b/assets/voxygen/voxel/npc/wolf/wolf_ears.vox index 7f1ef0d71a..b7c6231844 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_ears.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_ears.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:894814110d328942a5d4beb13d5152c2e30a6d25466b73996b87858d8173626b -size 1160 +oid sha256:85da6b879004886b43a159a04b65417ab5d2ce7025f40ddf840f6a6099bd7e0a +size 44307 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_jaw.vox b/assets/voxygen/voxel/npc/wolf/wolf_jaw.vox index 95485232fe..df6a3470b6 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_jaw.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f4e6f80a06a74930b13b44973253ff9617e0b3e52c5b8965db42b2015e031bc -size 1280 +oid sha256:3190632201cc65f1a57b944cc07fd182ae3eceec2fc2852ffb3da3cd1a02d53e +size 44387 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox index ce27f62f42..3d08b2c5d9 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b36a638e9ddd22b7edbb69194bd7867c97353374dad24110346ca71a71d51e36 -size 1344 +oid sha256:babd73717f66de32d4f4d9f4b7292282868f5144d471b884482b954706329a6a +size 44451 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox index 3d032fd351..7c5c2e8b64 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6569c6bcc2cdab88950bc2e50bfb3033c0f12c87032f248995d324e4f4241a75 -size 1344 +oid sha256:9f24f04d38cceb52344d33de69baeead27cb50fec15c6ef80d6115a4be6a419f +size 44451 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox b/assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox index 8d6190af5d..51bfcf9e2d 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79402309388f714c412daf46cb6ca1c4c57751c9cd4c11f627cf1d5da861c909 -size 3552 +oid sha256:77d567a024aabc463b938e662f0340d1d88a62686950e12cdd583039fd32b893 +size 46691 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox index d9177dbe6c..3c867f0b8e 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:553e8b5c04dc87766fd9c12da28f5ed32b6dc0c6726b8ff9d947219353a943de -size 1344 +oid sha256:66999e39ff845b84abf89ecb75cf235d8858c9ef0e7b3be5cd0b3cf16f0103de +size 44451 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox index 9b3638294b..5473932907 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a5edbc41efd7406f88129ab9973bf167067cd3ffe8d358cc8c11201d60195fa -size 1344 +oid sha256:a0e5984c410c1cf6891ae966541e25eb19ffefb56a2bf82d0d762c9d4b5464b0 +size 44451 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_tail.vox b/assets/voxygen/voxel/npc/wolf/wolf_tail.vox index cdf00babd5..3cbae3bb41 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_tail.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccd769ae44f888daa53097161ef440c93805479224094fa25d31f1c7a0e76ce -size 1672 +oid sha256:25d41aef2c2b86c287b46ba301c8009c010750fa6c892e778ba76605c7055544 +size 44779 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox b/assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox index b893688dba..fbcf070931 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1543beca2bc9487d5f85035d481f118a2863ccf3c7f0ca5a709ae5e1bb3d8d04 -size 5504 +oid sha256:393e513cb20d41b71e093a782938b33ed1dae801e19875342b2db72c5e964782 +size 48667 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox b/assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox index 29b2d1bfb0..d2e23b9d34 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d268d096fb5f69d0d1eb693595112c3e095e492a311eeffcbe0cd2459da7591 -size 5932 +oid sha256:0c555e7dd857f908b787a53118d17d908a96762e3fe10f63a692d2969ac67eb5 +size 48863 diff --git a/assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox b/assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox index 8ff0fca5b3..f750396fb1 100644 --- a/assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox +++ b/assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc326cdab30057cac8a204d43ae4007985ca38d21c6a9f734ac8c50cb74dfed8 -size 4656 +oid sha256:649ef3c87c3505e8599c75726236ff8e9d13caedd0bdec1155bd437cb486425f +size 47755 diff --git a/voxygen/src/anim/quadrupedmedium/idle.rs b/voxygen/src/anim/quadrupedmedium/idle.rs index 3bbfa0d7ef..7b4fcd82db 100644 --- a/voxygen/src/anim/quadrupedmedium/idle.rs +++ b/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; diff --git a/voxygen/src/anim/quadrupedmedium/jump.rs b/voxygen/src/anim/quadrupedmedium/jump.rs index 0ed7c70ee8..c85aa79df0 100644 --- a/voxygen/src/anim/quadrupedmedium/jump.rs +++ b/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); diff --git a/voxygen/src/anim/quadrupedmedium/run.rs b/voxygen/src/anim/quadrupedmedium/run.rs index f9ac6c77f0..c1b972f63a 100644 --- a/voxygen/src/anim/quadrupedmedium/run.rs +++ b/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); diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs index 323aef618e..139326e047 100644 --- a/voxygen/src/hud/settings_window.rs +++ b/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 - Offset your position \n\ + /goto - Teleport to a position \n\ + /tp - 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\