diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ef4a6140..ca508fb866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Petting animals tamed by you or someone else! +- Updated furniture sprites. ### Changed diff --git a/assets/voxygen/voxel/sprite/door/door-wide.vox b/assets/voxygen/voxel/sprite/door/door-wide.vox index 1d4b42a3ac..971c898f54 100644 --- a/assets/voxygen/voxel/sprite/door/door-wide.vox +++ b/assets/voxygen/voxel/sprite/door/door-wide.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a11b60ba0364781be1c20bdfa5f0f667bd01cb79e7edcd4c1a240a278636393 -size 8404 +oid sha256:cc990b9b1063a958e7359b5875b968401982f82822cf1299060c229d173bea22 +size 7812 diff --git a/assets/voxygen/voxel/sprite/furniture/chair_single-0.vox b/assets/voxygen/voxel/sprite/furniture/chair_single-0.vox index 9402e5df62..27fe98ff1b 100644 --- a/assets/voxygen/voxel/sprite/furniture/chair_single-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/chair_single-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ca06a68c173317e88980b02e83bedc4623742e0bccc957b03d4be7897433d9b -size 2036 +oid sha256:10526aa66e1214b09a759c87a7b669a1521c3afe7f4107c34faef3d456c47d39 +size 2404 diff --git a/assets/voxygen/voxel/sprite/furniture/chair_single-1.vox b/assets/voxygen/voxel/sprite/furniture/chair_single-1.vox index c604d64e7f..24e53948da 100644 --- a/assets/voxygen/voxel/sprite/furniture/chair_single-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/chair_single-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7503a4c4d314dbb1fa48f16d2fa74bbd80280fe15035db1ffb7d7e533e1a0671 -size 1916 +oid sha256:ac6a6a0cf79debf7fca207b036007560613e1ba6f942969208db4bbe6de6ed35 +size 2336 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-0.vox b/assets/voxygen/voxel/sprite/furniture/crate-0.vox index 8304a49b72..c964bce6fd 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d53d47695a2fe815fcbb5ce53daf4d804ca43637afd011d7050809c4f3860ba +oid sha256:53325af0f1538a5facff6650f551a43560a3d4281b775eff7553e000017f16df size 4480 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-1.vox b/assets/voxygen/voxel/sprite/furniture/crate-1.vox index 8304a49b72..c964bce6fd 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d53d47695a2fe815fcbb5ce53daf4d804ca43637afd011d7050809c4f3860ba +oid sha256:53325af0f1538a5facff6650f551a43560a3d4281b775eff7553e000017f16df size 4480 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-2.vox b/assets/voxygen/voxel/sprite/furniture/crate-2.vox index 758f906d61..28bddf743d 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-2.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ae3cabd7530c0b07bd5d99aae2bf4643e0a9cde5e2d89d64ac78568b3ac203c +oid sha256:75f3e7ddd370538695b93b49a4265185cb04721f3043a56034f8edb64b53c58d size 1816 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-3.vox b/assets/voxygen/voxel/sprite/furniture/crate-3.vox index 2769021650..8c38250aef 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-3.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b19de55578a92ac431f8b52e80933bf80e9106adf2ba6808518f4c84e22a22ef -size 2064 +oid sha256:d1e91e9495daac41f210e5c32aa72966ee171b5fb060d64550845b0dd779b603 +size 1840 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-4.vox b/assets/voxygen/voxel/sprite/furniture/crate-4.vox index a97a8c9723..abf77c8908 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-4.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d38490f030f6f332db5d60f4baa5f052a2dcbbf64b20453431a26071bf125f4 -size 2064 +oid sha256:9fbeaa70666203eae77272e76b2e15f0ff5d7eb4d0f3f31bfe9f0ee9cdf7c218 +size 1840 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-5.vox b/assets/voxygen/voxel/sprite/furniture/crate-5.vox index 15f0b2081c..828c7f512f 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-5.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acc1f08cd24f8c8d2058d0c0cdc763f5b1a543bd86f05fadc631375693411207 -size 2064 +oid sha256:edafbc559b59bfdedde7b67719d4c60319971a6b0637aa719cbcf27a50a3f19a +size 1840 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-6.vox b/assets/voxygen/voxel/sprite/furniture/crate-6.vox index eeb29c6d8a..6b1e891cfb 100644 --- a/assets/voxygen/voxel/sprite/furniture/crate-6.vox +++ b/assets/voxygen/voxel/sprite/furniture/crate-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9aa0420a2dadca38429a05a1433c30b9ec931e5c9af5d06c838fb23d5d83c0d8 -size 2176 +oid sha256:10a81208c03c32e99b8f7f9211871d049ddb0a86638746004b46ea46e37a1086 +size 1840 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox b/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox index d37bea3842..3cc131022e 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b288a9470d9e3b89959035b855508d43454c1a57d2dd96deb6f71e087688629 -size 10352 +oid sha256:f885e95a081ae0b9e3393d30d07f4b5b149d43032cfc3afdc9db65d4a5a418c4 +size 10356 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox b/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox index 4bef736a28..ce83c927e3 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c79030afd2d1aa29424e7204a494ecfb5c8d4c45141ee4d0330d76b5ca019b1 +oid sha256:a26253ff996635cac1532bb7b6c6cc68bfbf4d382775dc0fcb527d7fcaa5c274 size 10120 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_medium-0.vox b/assets/voxygen/voxel/sprite/furniture/drawer_medium-0.vox index 4667aae067..98c97d205b 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_medium-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_medium-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:015a3a9c385e61177017ebf511f083a99a31d02679f778f331f7831e6181ab8d -size 7128 +oid sha256:81dec6b413220b34d12ec61db190c9a883d7d9c3db60e8664f61b4e3a7817837 +size 7424 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_medium-1.vox b/assets/voxygen/voxel/sprite/furniture/drawer_medium-1.vox index 8bccf65943..7cc9a63daf 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_medium-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_medium-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a40632a8fdeb35a1313fcf0541f5fb72cfbf0f5f335c7158a0ecd04aa89cdf2 -size 7352 +oid sha256:683f029e29b32188f5dd34cba6fc381f0f12baa509e94783b5597d6ee9d3fa54 +size 7620 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_small-0.vox b/assets/voxygen/voxel/sprite/furniture/drawer_small-0.vox index 372271641d..aa568a5328 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_small-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_small-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25a86675ffd3a70288ab7a77801a0b7a7a36bf860724c2412a9eff07a642e09 +oid sha256:da542b13d6dcc75921a1490cc4102afcd542e0146ba1cc70c11879767270b441 size 4520 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_small-1.vox b/assets/voxygen/voxel/sprite/furniture/drawer_small-1.vox index 252c5b9ecb..2a97cfcde8 100644 --- a/assets/voxygen/voxel/sprite/furniture/drawer_small-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/drawer_small-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f28067210367a925314ecd11aa0c4231dc8f8abf48bd1d57f3a33943fec522f7 -size 4520 +oid sha256:16bda9dd5882bb4ce46c721b22ae84e79dd122634683222428a109d4902cbcb0 +size 4584 diff --git a/assets/voxygen/voxel/sprite/furniture/table_dining-0.vox b/assets/voxygen/voxel/sprite/furniture/table_dining-0.vox index 0d1c3070cb..939af9c32e 100644 --- a/assets/voxygen/voxel/sprite/furniture/table_dining-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/table_dining-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbe3a4f9c73c2aa3e8f864d525fb43c063be5c848283f1f1cef6bbba37dc8e55 -size 2228 +oid sha256:7ec75e9208ef524aad96514c1600b6cdce560fb2eecf9c53f46f2f64ad50fa75 +size 2900 diff --git a/assets/voxygen/voxel/sprite/furniture/table_dining-1.vox b/assets/voxygen/voxel/sprite/furniture/table_dining-1.vox index 75ff82242a..7aec671634 100644 --- a/assets/voxygen/voxel/sprite/furniture/table_dining-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/table_dining-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35f9d61fecd0023c9301a8c2dc3ca23d42b28c14176f7c4b757c80678c9a6fb -size 2564 +oid sha256:8a24890f7ba658cee43b134dcbf556bcb0ecafbf293fbfb6edc47ce2963572bb +size 3488 diff --git a/assets/voxygen/voxel/sprite/furniture/table_double-0.vox b/assets/voxygen/voxel/sprite/furniture/table_double-0.vox index 94731c1c6c..393f02386c 100644 --- a/assets/voxygen/voxel/sprite/furniture/table_double-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/table_double-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c43b6aa7226467818a1fd47b7ae6054f1d628a1eab5c5e2381454dcca26d3a56 -size 5576 +oid sha256:855285466ad4326913eff1c3aa4cc2f0073217a5b64237d0fd225517c56312a7 +size 8448 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox index 1bf1793559..18a394a996 100644 --- a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:963f9ef3bfe6c265886f3dc49c7ac04efa3e996bd0a4fd5c7670a6011fea8831 -size 23868 +oid sha256:1f876b22215cc1c6088eb36d072f40bfb81e01b87d02608aa3d08fee37c070ba +size 23916 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox index 33870384bb..520c28993b 100644 --- a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a564f82caa29a9dd2e7d8a9345a5544825d5aa41fa3f9e4812b5b35166fb2411 -size 24180 +oid sha256:beb87091583ce20b90341df186ee02b10cf3970ea159afe0627d6a120b95c4d6 +size 24284 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox index 3fda9eca89..ea6ea4e325 100644 --- a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:931ae880000e0e775ceb5b8b00f54979f06ef94f2088f435681beb02292cd804 +oid sha256:59686dd63a10ba539e9c37c0bfb560b96b5e648fc68ed8a32be53e62ef99bfb8 size 13328 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox index dd8a7e3615..cb10481499 100644 --- a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d6b5366dbb1c8c451c2e832ef6d61e9dbd2b6db84eb7e9e9760bc3624736466 +oid sha256:519256ecd0652d2005a43fba880e6a444c49dbf310c2aa7d2b9817e6402a8b5d size 13048 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 1c8e64bb12..48751da3c8 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2595,12 +2595,12 @@ DrawerMedium: Some(( variations: [ ( model: "voxygen.voxel.sprite.furniture.drawer_medium-0", - offset: (-11.0, -5.0, 0.0), + offset: (-11.5, -5.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( model: "voxygen.voxel.sprite.furniture.drawer_medium-1", - offset: (-11.0, -5.0, 0.0), + offset: (-11.5, -5.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -2894,7 +2894,7 @@ WardrobeDouble: Some(( ), ( model: "voxygen.voxel.sprite.furniture.wardrobe_double-1", - offset: (-10.5, -6.0, 0.0), + offset: (-10.5, -6.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -2905,7 +2905,7 @@ WardrobeSingle: Some(( variations: [ ( model: "voxygen.voxel.sprite.furniture.wardrobe_single-0", - offset: (-5.5, -6.0, 0.0), + offset: (-5.5, -6.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), (