uniior
92a2e5da8b
Resolve merge conflict
2024-06-22 13:56:09 -04: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
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
Sam
d1b54b7da4
Changelog
2024-06-03 21:24:41 -04:00
Sam
b6d08a8d24
Fixed migration
2024-06-03 21:24:16 -04:00
Sam
d7f5c013ad
Remove ItemVisualKey
2024-06-03 21:24:16 -04:00
Sam
c2604ef527
Added test for each recipe being reachable. Made new recipes reachable.
2024-06-03 21:24:16 -04:00
James Melkonian
b40a14ae62
Initial recipe component work
...
Insert RecipeBook into ECS
Add recipe command
Fully functional recipes
Recipe items
Update item_image_manifest.ron
scroll item image/drop model
Colored recipe vox models
Reset recipes command
Move RecipeBook into Inventory
Persistence for recipe book
Recipe book migration
Recipe items can now be dynamically generated from the recipe book
Removed recipe items and recipe item generation bin
Fix rebase
Made recipes available in world
Fix rebase
Default recipes to manifest
Recipes now have prices in economy.
Changed recipes to go into kind before reaching item visual manifests.
Default recipes automatically added to recipe book on character load.
Loot table rebalancing
Addressed balance feedback
MR review feedback
Recipes are now unlocked in groups
Modular weapon component recipes now require learning recipes
Metal weapon recipes now also teach how to craft their requisite ingots
Added test for all recipes being valid
2024-06-03 21:24:15 -04:00
Marcel
9036baa479
Merge branch 'neura/kiddo-update' into 'master'
...
Update kiddo from 0.2 to 4.2.0
See merge request veloren/veloren!4471
2024-06-03 23:12:54 +00:00
Youser Nayme
7edbb4449e
Update kiddo from 0.2 to 4.2.0
2024-06-03 23:12:53 +00:00
flo
69003aaebe
Merge branch 'worldboss_aggro_fix' into 'master'
...
worldboss_aggro_fix
See merge request veloren/veloren!4490
2024-06-03 06:52:13 +00:00
flo
8863ea53c4
worldboss_aggro_fix
2024-06-03 06:52:13 +00:00
crabman
a168ea8dcd
Merge branch 'crab/macos-artifact-fix' into 'master'
...
Take artifacts from the correct profile on macos builds
See merge request veloren/veloren!4489
2024-05-31 10:15:21 +00:00
crabman
8d07447b47
Take artifacts from the correct profile on macos builds
2024-05-31 08:46:44 +00:00
crabman
e9b766d146
Merge branch 'crab/ci-image-update' into 'master'
...
update ci cache
See merge request veloren/veloren!4488
2024-05-30 20:06:35 +00:00
