Commit Graph

5642 Commits

Author SHA1 Message Date
Youser Nayme
a145b0ea2c
Update dispatch 2024-06-23 21:50:46 -04:00
Youser Nayme
48dfac6f8b
Update hashbrown 2024-06-23 10:40:04 -04:00
James Melkonian
b3ae2abbd2 Limit vertical scaling UI minimum to 0.1 2024-06-22 00:25:25 -07: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
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
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
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
Sam
4ef1be08ec Character animation restructuring 2024-06-05 22:31:17 -04: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
d7f5c013ad Remove ItemVisualKey 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
Samuel Keiffer
c065b689ac Merge branch 'sam/buff-split-stats' into 'master'
Damage and poise reduction stats now track split modifiers

See merge request veloren/veloren!4484
2024-05-29 15:52:55 +00:00
Samuel Keiffer
79d97cdc22 Merge branch 'sam/diminishing-cc' into 'master'
Diminishing returns for certain crowd control debuffs

See merge request veloren/veloren!4482
2024-05-29 15:50:09 +00:00
Samuel Keiffer
eeb68797e7 Merge branch 'new_sahagin' into 'master'
new_sahagin

See merge request veloren/veloren!4467
2024-05-29 00:01:46 +00:00
flo
ee608d3c25 new_sahagin 2024-05-29 00:01:46 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
Sam
8b24ca68a8 Damage and poise reduction stats now track split modifiers 2024-05-27 22:06:12 -04:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
Sylv
c9141f4c6b Fix #1806: Localize PromptDialog 2024-05-24 17:18:41 +00:00
Youser Nayme
fbe7db846e
Update treeculler 2024-05-20 13:04:21 -04:00
Youser Nayme
23afb9237f
Update rodio 2024-05-20 13:04:21 -04:00
Youser Nayme
d6f239832a
Update native-dialog 2024-05-20 13:04:21 -04:00
Youser Nayme
1fd72a93e1
Unpinned cmake version as the original issue has been fixed.
Also ran `cargo update` to actually update the crate.
2024-05-20 13:04:20 -04:00
Marcel
f5fc2294a6 Merge branch 'xMAC/update-toolchain' into 'master'
update toolchain to `2024-05-14`

See merge request veloren/veloren!4466
2024-05-19 00:40:55 +00:00
Marcel Märtens
e48fc4c2b2 additional cargo clippy for toolchain switch 2024-05-18 22:44:59 +02:00
Marcel Märtens
5f41aefacb update toolchain to 2024-05-14 2024-05-18 00:58:54 +02:00
Marcel
246d90cf22 Merge branch 'fotkurz/plugin-bookkeepingoptimization' into 'master'
Fix #1968: refactor missing_plugins check for better performance

Closes #1968

See merge request veloren/veloren!4463
2024-05-17 22:15:40 +00:00
fotkurz
13a3c53307 Fix #1968: refactor missing_plugins check for better performance 2024-05-16 13:22:11 -03:00
Marcel Märtens
b770665fb9 new toolchain lints helped us to find issues, backporting the bugfixes here.
NOTE: we havent had world enabled in server/agent, this MR now enables this, might have some (hopefully positive) effects on our agent code
2024-05-16 10:40:15 +02:00
James Melkonian
25ad114072 Rocksnapper AI and animation tweaks 2024-05-14 18:22:20 -07:00
James Melkonian
7a23314e3b bowser spin animation 2024-05-14 18:22:20 -07:00
flo
76628057b5 new_cultist 2024-05-12 18:33:11 +00:00
Isse
6c0da4beeb
allow searching in both selected language and fallback langauage in crafting 2024-04-29 13:33:11 +02:00
Sam
38df083e0c Changelog entry, better placeholder UI, remove test changes 2024-04-28 20:04:07 -04:00
Sam
0dc261c70a Judgement 2024-04-28 19:43:50 -04:00
Sam
244ffcf03e Earthshaker 2024-04-28 19:43:49 -04:00
Sam
171125e73e Seismic shock 2024-04-28 19:43:49 -04:00
Sam
caac8025c6 Thunderclap 2024-04-28 19:43:49 -04:00
Sam
85e9af4e08 Tenacity 2024-04-28 19:43:49 -04:00
Sam
7daa9a29eb Rampart 2024-04-28 19:43:49 -04:00
Sam
e1ce09e0a1 Upheaval 2024-04-28 19:40:12 -04:00
Sam
b25e91e79a Iron tempest 2024-04-28 19:40:12 -04:00
Sam
b8de5e414b Helm Crusher 2024-04-28 19:40:12 -04:00
Sam
38c74bf182 Finish rooted debuff impl and Lung Pummel 2024-04-28 19:40:12 -04:00