coffee-compiler
7a3f3cc555
Reworked repair equipment interface in crafting menu
2024-07-31 13:04:12 +00:00
coffee-compiler
15eeab7405
Fix crash on server list entry deletion
2024-07-31 07:41:35 +00:00
Marcel
2a3ed498d0
Merge branch 'coffee-compiler/fix_modular_crafting_flick' into 'master'
...
Fix UI flick when clearing slot in crafting menu
See merge request veloren/veloren!4538
2024-07-29 14:52:22 +00:00
coffee-compiler
1e052aa905
Fix UI flick when clearing slot in crafting menu
2024-07-29 14:52:22 +00:00
coffee-compiler
0037c81c27
Localize pseudo recipes
2024-07-29 14:44:01 +00:00
Marcel
6f24394c35
Merge branch 'fix-black-minimap' into 'master'
...
Fix minimap bug
See merge request veloren/veloren!4514
2024-07-28 20:59:47 +00:00
Aidar Shaikhiev
88d85108d5
Fix minimap bug
2024-07-28 20:59:47 +00:00
Marcel
0669f5d8e6
Merge branch 'coffee-compiler/diary_section_localization' into 'master'
...
Localize diary section and skill tree titles
See merge request veloren/veloren!4532
2024-07-28 20:53:59 +00:00
coffee-compiler
b061e4726e
Localize diary section and skill tree titles
2024-07-28 20:53:59 +00:00
coffee-compiler
8b5b177e49
Fix modular weapon crafting instructions overflow
2024-07-28 20:47:45 +00:00
Marcel
0e64ac29ad
Merge branch 'coffee-compiler/localize_invites' into 'master'
...
Localize group & trade invite answers
See merge request veloren/veloren!4535
2024-07-27 22:06:50 +00:00
coffee-compiler
a731d85c83
Localize group & trade invite answers
2024-07-27 22:06:49 +00:00
Marcel
2746d8403e
Merge branch 'coffee-compiler/localize_singleplayer_server_name' into 'master'
...
Localize singleplayer server name in char selection
See merge request veloren/veloren!4533
2024-07-27 22:03:31 +00:00
coffee-compiler
a263d8d88a
Localize singleplayer server name in char selection
2024-07-27 22:03:31 +00:00
coffee-compiler
009ca07303
Localize item amount
2024-07-27 21:51:09 +00:00
coffee-compiler
007397c644
Remove single file binary folders
2024-07-23 11:59:15 +00:00
coffee-compiler
0ce0ffba14
Comply to new module structure convention
2024-07-22 10:29:30 +00:00
Samuel Keiffer
4e63622f2a
Merge branch 'sam/anim-restructure-arthropod' into 'master'
...
Arthropod anim restructure
See merge request veloren/veloren!4521
2024-07-17 00:26:05 +00:00
coffee-compiler
c1d10279ca
fmt code
2024-07-16 19:14:00 +02:00
coffee-compiler
2bf4096dfb
replace dx11 with opengl in panic msg
2024-07-16 18:33:23 +02:00
Sam
ca5c2dca7e
Arthropod anim restructure
2024-07-10 18:17:53 -04:00
Marcel
21f4ae3b85
Merge branch 'xMAC94x/update_toolchain' into 'master'
...
update toolchain to 2024-07-07
See merge request veloren/veloren!4522
2024-07-10 05:58:25 +00:00
Samuel Keiffer
9c129e8c24
Merge branch 'horblegorble/gnarling-bosses' into 'master'
...
broad updates to wooden golem, gnarling chieftain, harvester
See merge request veloren/veloren!4485
2024-07-10 00:51:53 +00:00
Marcel Märtens
a698a7d46e
update toolchain to nightly-2024-07-07
2024-07-09 16:29:33 +02:00
Marcel Märtens
618492da39
prepare comments intendation for next toolchain
2024-07-09 00:27:25 +02:00
Sam
2daba842bd
Show acquired recipes in diary screen
2024-07-06 20:55:09 -04:00
James Melkonian
3dcf9ab62e
Make charm recipes accessible by putting them in the potion tab of the crafting menu
2024-06-30 23:27:33 +00:00
horblegorble
67c79a5759
broad updates to gnarling forts
2024-06-28 15:22:32 +10: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
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
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
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
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
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
