Commit Graph

5686 Commits

Author SHA1 Message Date
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
Samuel Keiffer
0dc194bb6b Merge branch 'uniior/sword-anims' into 'master'
Sword animations #1

See merge request veloren/veloren!4520
2024-07-08 23:56:10 +00:00
uniior
38e403eab2 cargo fmt 2024-07-08 18:40:38 -04:00
Marcel Märtens
618492da39 prepare comments intendation for next toolchain 2024-07-09 00:27:25 +02:00
uniior
fc6b87d5ca Dual Cross Cut 2024-07-08 16:21:46 -04:00
uniior
ef3489806e Cross Cut 2024-07-08 16:21:45 -04:00
uniior
4b0e31a91d Cascade 2024-07-08 16:21:45 -04:00
uniior
d9ff439ffe Skewer 2024-07-08 16:21:45 -04:00
uniior
67691eda44 Fell Strike 2024-07-08 16:15:51 -04:00
uniior
255b084619 Hamstring/Crescent Slash 2024-07-08 16:15:50 -04:00
uniior
44c6270ad2 Quick Draw + tweaks
"Rebase"
2024-07-08 16:15:50 -04:00
uniior
6638184096 Double Slash, Heavy Sweep and Pommel Strike
"Rebase"
2024-07-08 16:15:49 -04:00
uniior
e7eb6b4159 Gouge 2024-07-08 16:15:49 -04:00
uniior
b402fa8473 Disengage 2024-07-08 16:15:49 -04:00
uniior
4eb0e8cd36 Feint draft + tweaks
"Rebase"
2024-07-08 16:15:48 -04:00
uniior
0ca6109769 Quick Draw + tweaks 2024-07-08 16:15:48 -04:00
uniior
67f7f24285 Double Slash, Heavy Sweep and Pommel Strike 2024-07-08 16:15:48 -04: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
493b4b8fd3 renamed vine summon abilities; brief comments for body_dist and it usage for harvester 2024-06-28 15:25:17 +10:00
horblegorble
67c79a5759 broad updates to gnarling forts 2024-06-28 15:22:32 +10:00
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