Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'burnpot-model' into 'master'

Browse Source 
New bed and door sprites

See merge request veloren/veloren!4184
This commit is contained in:
maxicarlos08 2024-01-25 21:12:36 +00:00
commit 880e9044d5
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/object/potion_combustion.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/door/door-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/bed-0.vox (Stored with Git LFS)
View File

Binary file not shown.

2
assets/voxygen/voxel/sprite_manifest.ron
View File

@ -2013,7 +2013,7 @@ Bed: Some((
variations: [ variations: [
( (
model: "voxygen.voxel.sprite.furniture.bed-0", model: "voxygen.voxel.sprite.furniture.bed-0",
offset: (-9.5, -14.5, 0.0), offset: (-9.0, -13.5, 0.0),
lod_axes: (1.0, 1.0, 1.0), lod_axes: (1.0, 1.0, 1.0),
), ),
], ],

2
common/src/terrain/sprite.rs
View File

@ -423,7 +423,7 @@ impl SpriteKind {
SpriteKind::Carrot => 0.18, SpriteKind::Carrot => 0.18,
SpriteKind::Radish => 0.18, SpriteKind::Radish => 0.18,
SpriteKind::FireBowlGround => 0.55, SpriteKind::FireBowlGround => 0.55,
SpriteKind::Bed => 1.54, SpriteKind::Bed => 0.72,
SpriteKind::Bench => 0.5, SpriteKind::Bench => 0.5,
SpriteKind::ChairSingle => 0.5, SpriteKind::ChairSingle => 0.5,
SpriteKind::ChairDouble => 0.5, SpriteKind::ChairDouble => 0.5,