mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Wolf model assets update
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
This commit is contained in:
parent
276dbd97cf
commit
8a3b308224
BIN
assets/voxygen/voxel/figure/body/pants_male.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/figure/body/pants_male.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_ears.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_ears.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_jaw.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_jaw.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_torso_back.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_torso_mid.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox
(Stored with Git LFS)
Binary file not shown.
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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\
|
||||
|
Loading…
Reference in New Issue
Block a user