mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'burnpot-model' into 'master'
New bed and door sprites See merge request veloren/veloren!4184
This commit is contained in:
commit
880e9044d5
BIN
assets/voxygen/voxel/object/potion_combustion.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/object/potion_combustion.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/door/door-0.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/sprite/door/door-0.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/furniture/bed-0.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/sprite/furniture/bed-0.vox
(Stored with Git LFS)
Binary file not shown.
@ -2013,7 +2013,7 @@ Bed: Some((
|
||||
variations: [
|
||||
(
|
||||
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),
|
||||
),
|
||||
],
|
||||
|
@ -423,7 +423,7 @@ impl SpriteKind {
|
||||
SpriteKind::Carrot => 0.18,
|
||||
SpriteKind::Radish => 0.18,
|
||||
SpriteKind::FireBowlGround => 0.55,
|
||||
SpriteKind::Bed => 1.54,
|
||||
SpriteKind::Bed => 0.72,
|
||||
SpriteKind::Bench => 0.5,
|
||||
SpriteKind::ChairSingle => 0.5,
|
||||
SpriteKind::ChairDouble => 0.5,
|
||||
|
Loading…
Reference in New Issue
Block a user