horblegorble
f9651a1289
recipe pricing adjustments; changed sea cleric drop
2024-06-26 16:45:24 +10:00
Marcel
5e41b34dc2
Merge branch 'neura/update-crates' into 'master'
...
Update various crates
See merge request veloren/veloren!4513
2024-06-24 04:58:20 +00:00
Youser Nayme
a145b0ea2c
Update dispatch
2024-06-23 21:50:46 -04:00
Youser Nayme
a12c320f8c
Update ordered-float
2024-06-23 21:50:45 -04:00
Youser Nayme
ca6bcaab7d
Update strum and itertools
2024-06-23 21:50:33 -04:00
Youser Nayme
36d192a2f6
Update chrono-tz
2024-06-23 11:17:07 -04:00
Youser Nayme
a1930b81d0
Update image
2024-06-23 11:07:15 -04:00
Youser Nayme
48dfac6f8b
Update hashbrown
2024-06-23 10:40:04 -04:00
Samuel Keiffer
2d3303384a
Merge branch 'uniior/armor-pricing' into 'master'
...
Saner pricing for worker/linen clothing
See merge request veloren/veloren!4511
2024-06-23 01:04:13 +00:00
Uniior
c399a549f8
Merge branch 'master' into 'uniior/armor-pricing'
...
# Conflicts:
# CHANGELOG.md
2024-06-22 17:57:23 +00:00
uniior
92a2e5da8b
Resolve merge conflict
2024-06-22 13:56:09 -04:00
Marcel
46ab1cb11e
Merge branch 'james/prevent-vertical-scaling-crash' into 'master'
...
Limit vertical scaling UI minimum to 0.1
See merge request veloren/veloren!4510
2024-06-22 16:04:20 +00:00
uniior
b3c5c4b48a
Changelog
2024-06-22 11:27:38 -04:00
uniior
ad62d5f9a3
Hotfix for worker/linen clothing pricing
2024-06-22 11:26:22 -04:00
James Melkonian
b3ae2abbd2
Limit vertical scaling UI minimum to 0.1
2024-06-22 00:25:25 -07:00
Samuel Keiffer
92af46c08f
Merge branch 'sam/fix-anims' into 'master'
...
Fix anims
See merge request veloren/veloren!4508
2024-06-22 00:54:01 +00:00
Sam
907c469afa
Fix anims
2024-06-21 18:03:57 -04:00
Marcel
d6d9c2ca57
Merge branch 'muphblu/fix-item-img-export' into 'master'
...
Fixes img-export #1761 set square dimensions for image
Closes #1761
See merge request veloren/veloren!4505
2024-06-19 07:19:59 +00:00
flo
790aeff27a
Merge branch 'wood-price-hotfix' into 'master'
...
Hotfix for log prices
See merge request veloren/veloren!4506
2024-06-19 03:57:58 +00:00
uniior
61193939fc
Hotfix for log prices
2024-06-18 21:17:56 -04:00
Samuel Keiffer
2f968095c7
Merge branch 'sam/anim-restructure' into 'master'
...
Character animation restructuring
See merge request veloren/veloren!4504
2024-06-18 00:27:01 +00:00
Sam
b168fea0b8
Fix cardinal steam beam animation
2024-06-17 19:09:39 -04:00
Sam
45b17feccd
Deduplicated match statement
2024-06-17 18:51:56 -04:00
Aidar Shaikhiev
7dcc559f51
Fills CHANGELOG.md
2024-06-18 01:13:50 +05:00
Aidar Shaikhiev
623e3aef93
Fix images that used hollow cells
...
Reused item_imgs.rs for image loading and preprocessing, because it is removes hollow cells.
Example: assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox
2024-06-18 01:08:42 +05:00
Aidar Shaikhiev
8221a11fe5
Fixes #1761 set square dimensions for image
...
Images rendered by veloren_voxygen::ui::graphic::renderer::draw_vox have equal width and height, because of camera settings. Needed just to set square dims for result image instead of calculating its rotated dims.
2024-06-18 00:31:25 +05:00
Aidar Shaikhiev
226913d5f5
Fix old compilation bug
2024-06-18 00:31:24 +05:00
Aidar Shaikhiev
5f0fedadb5
Fix old compilation bug
2024-06-18 00:31:24 +05:00
Marcel
12726cf58c
Merge branch 'weblate-translation' into 'master'
...
Update translation files (Weblate)
See merge request veloren/veloren!4503
2024-06-16 22:11:44 +00:00
Otto Richter
7cca60031b
Update translation files (Weblate)
2024-06-16 22:11:44 +00:00
flo
e4cd939eb8
Merge branch 'adjust_large_bird_routes' into 'master'
...
adjust_large_bird_routes
See merge request veloren/veloren!4492
2024-06-11 22:02:37 +00:00
flo
998a8a8273
adjust_large_bird_routes
2024-06-11 22:02:37 +00:00
Marcel
8589e8f9f6
Merge branch 'sam/fix-pr-typo' into 'master'
...
Fix typo
See merge request veloren/veloren!4500
2024-06-09 16:04:22 +00:00
Sam
a4485d9914
Fix typo
2024-06-08 17:56:13 -04:00
Samuel Keiffer
5c0299ef82
Merge branch 'sam/migration-fix-fix' into 'master'
...
Actual migration fix
See merge request veloren/veloren!4498
2024-06-07 21:04:14 +00:00
Sam
d2a85ba014
Touch file
2024-06-07 15:51:15 -04:00
Sam
a58530a38f
Actually fixed
2024-06-07 15:48:04 -04:00
Samuel Keiffer
71e406f488
Merge branch 'sam/fix-migration' into 'master'
...
Fixed migration
See merge request veloren/veloren!4497
2024-06-07 03:48:59 +00:00
Sam
361c3f1400
Fixed migration
2024-06-06 20:13:32 -04:00
Isse
c205a1fae2
Merge branch 'isse/fix-give' into 'master'
...
Don't crash with the give_item command with wrong item path
See merge request veloren/veloren!4495
2024-06-06 17:28:01 +00:00
Marcel
0bb07662e2
Merge branch 'xMAC94x/update_hyper' into 'master'
...
Update hyper/axum and dependent crates.
See merge request veloren/veloren!4491
2024-06-06 16:01:30 +00:00
Isse
9c51b1258a
Don't crash with give command
2024-06-06 17:31:52 +02:00
Sam
4ef1be08ec
Character animation restructuring
2024-06-05 22:31:17 -04:00
Samuel Keiffer
bee04f84d4
Merge branch 'horblegorble/interim-hammer-tweaks' into 'master'
...
interim hammer tweaks - m2 poise, vigorous bash combo
See merge request veloren/veloren!4493
2024-06-05 23:51:25 +00:00
horblegorble
5eea891812
nerf retaliate damage
2024-06-06 02:28:33 +10:00
horblegorble
d14c185a78
wallop angle increase; damage and scaling decreases for judgement and thunderclap
2024-06-05 19:00:43 +10:00
horblegorble
bfef917693
interim hammer tweaks - m2 poise, vigorous bash combo
2024-06-05 15:09:41 +10:00
Samuel Keiffer
1f0e014daa
Merge branch 'james/recipes' into 'master'
...
Unlockable recipes
See merge request veloren/veloren!3837
2024-06-04 21:06:52 +00:00
Marcel Märtens
0f84c5d6f0
remove CryptProvider code again, it seems to be nolonger possible when axum uses hyper-rustls with native-tokio and ring feature active
2024-06-04 14:43:25 +02:00
Marcel Märtens
75f2e0800a
Update hyper/axum and dependent crates.
...
note this removes an old rustls, due to the new one we require to initialize our CryptoProvider.
also removed a very verbose trace.
2024-06-04 14:31:36 +02:00
