From 8939385b92b903dee226578e594aee8e39d62fb4 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Sat, 28 Sep 2019 19:36:12 +0200 Subject: [PATCH] assets, rotation, offset changes --- .../voxygen/voxel/weapon/bow/simple-arrow.vox | Bin 1164 -> 55647 bytes .../voxygen/voxel/weapon/bow/simple-bow.vox | Bin 55743 -> 55928 bytes voxygen/src/scene/figure/load.rs | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/voxygen/voxel/weapon/bow/simple-arrow.vox b/assets/voxygen/voxel/weapon/bow/simple-arrow.vox index 107a7b8a2062453f0aeb87fbfc8b165b86cb20bd..c091ed4b520e68347668144a380d3ed46d748ddd 100644 GIT binary patch literal 55647 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 delta 140 zcmWlQyA1*{5JcbF=3{dS$(a!7ga8Q(0Ra-ayGqDtfS5v{6)vU~#v?tw8ENR$GuHQ#;u9NE?%ZN2HcefD|&KhO91 z?z^;TxEnL*-5t9!9C3)^j;oE|pwP?Bv8w%Fcu`&s;@_Dm-HY(sv3mDH~2rUT?qpb~P z3u-1CWgDB>!jc4aF;XYAB%9KM%9PQeOqs0fVtvA`afJp06|PTXBXbJjAk5*nzH3pN zCcMg{Otn#CT~tMuC1T0|ld+&L*|IlYVxj=T89;Xpjzj^w$}`r*IA9&nf9XHe}fed%Ga-pkUp&VADl`Wl)e2735HNo);a}?N+oMv?DZ{ zgEuZegrPF=C3Q9&t~z=#DhnF(2N;Mm42%$4WjR)ZU8TaQT*TqbT4KZq`vJS>=>5X9#M*Dg^H2+lSO zK6+ZPx?d2Yez;pO-cS3mpwTPXTPqlD5}cyFv)YA$=37`FD%)#Wf#RZEEAmoc_YXLj2eR1UrFI{E9|w1HLH-ru7z}q2V7-u=Vkic&cRqd%CV;=m2nJ zdJfTZF}%5O1#f@4f|^6eu=V8`>^QT8u8S-9%Yba~_W>X1*YDkczjE!n-H+q(_yc`O lM>6Mrd4KrUlJCX+*_O;%{J`9QL-`jSpIeQpX2SF3%x@`tXUYHo delta 1301 zcmdsy-Aj{k6vxlAXY*~d6;#MXwt*Yygo$G%55YEaGAC;@UFtJ)CR1_=8*D-DqQ?tS zSb`UuQiFIvG;Cdr*m|KGyXq#%ZWef1-Sr1Vci+zNAMi$k4t&n}o%i4QQxgxXqH-rZ zW!WL3kZ#$niGL zYdeTUM#pHFCPrYIIoHA;Xl2{RzMe5K?aYOa!c!q2I11l|o>m?2=(qG+2CJ7fGlF6= znP4`XVYAuL+uIAL(+RiR4M~#V@p$0(`w>{4$ma)5z zybDrVg72{pfz1FSr3fYuCb3XiK;~Tr=9{CijmhYXFJa)pBMh!=z_YOfe{mn9yEVu! zKVa$gN2q*Eoe#jW{*+BGVn!q0cXi=sEC!R}9D{3S7pdY`bVfSiR^3P+r=d=8W11VE vaN{|Oa*nglGWtKd);)gSfWqA*Z6IZ^)tEn!^e diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 296e41a643..db34806be3 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -357,7 +357,7 @@ pub fn mesh_main(item: Option<&Item>) -> Mesh { Tool::Hammer => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::Daggers => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::SwordShield => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), - Tool::Bow => ("weapon.bow.simple-bow", Vec3::new(0.0, -2.5, 4.0)), + Tool::Bow => ("weapon.bow.simple-bow", Vec3::new(-1.0, -6.0, -2.0)), Tool::Staff => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), }, Item::Debug(_) => ("weapon.debug_wand", Vec3::new(-1.5, -9.5, -4.0)),