Commit Graph

15882 Commits

Author SHA1 Message Date
coffee-compiler
9d22f79ce0 Update cmd_doc_gen to print client command table as well 2024-08-16 15:32:50 +00:00
crabman
09825d6769 Merge branch 'uniior/sword-anims2' into 'master'
Sword animations #2

See merge request veloren/veloren!4550
2024-08-14 14:20:44 +00:00
Uniior
9912149f56 Sword animations #2 2024-08-14 14:20:44 +00:00
crabman
b8feae67de Merge branch 'coffee-compiler/fix_trade_with_everyone' into 'master'
Fix ability to send trade requests to every entity

See merge request veloren/veloren!4549
2024-08-14 09:53:58 +00:00
coffee-compiler
ea533afc01 Fix ability to send trade requests to every entity 2024-08-14 09:53:58 +00:00
Marcel
5ec99290f2 Merge branch 'coffee-compiler/remove_help_window_setting' into 'master'
Remove help window option from interface settings

See merge request veloren/veloren!4548
2024-08-11 13:29:51 +00:00
coffee-compiler
9e90503f46 Remove help window option from interface settings 2024-08-11 13:29:51 +00:00
Imbris
2365209c12 Merge branch 'coffee-compiler/add_clear_command' into 'master'
Add clear command

See merge request veloren/veloren!4542
2024-08-07 19:48:46 +00:00
coffee-compiler
4626036ddf Add clear command 2024-08-07 19:48:46 +00:00
Marcel
98011dad62 Merge branch 'coffee-compiler/repair_equipment_requirement_checks' into 'master'
Add repair equipment requirement checks

See merge request veloren/veloren!4547
2024-08-07 15:29:44 +00:00
coffee-compiler
da132d20da Add repair equipment requirement checks 2024-08-07 15:29:44 +00:00
Samuel Keiffer
2c5bff33fe Merge branch 'srpapinha/new-potion-and-some-buffs' into 'master'
Freezing potion and debuff immunity

See merge request veloren/veloren!4517
2024-08-04 22:14:53 +00:00
Papinha
dcc2163188 Freezing potion and debuff immunity 2024-08-04 22:14:52 +00:00
crabman
e6c2808fbd Merge branch 'update-wiki-link' into 'master'
doc(nix): update wiki link

See merge request veloren/veloren!4545
2024-08-03 07:31:34 +00:00
crabman
89f5af2002 Merge branch 'coffee-compiler/remove_unused_ftl_keys' into 'master'
Remove unused localization keys

See merge request veloren/veloren!4546
2024-08-02 14:13:36 +00:00
coffee-compiler
7ae4c30458 Remove unused localization keys 2024-08-02 14:13:36 +00:00
Tomodachi94
2e3375ccf0
doc(nix): update wiki link
Further reading: https://github.com/NixOS/foundation/issues/113
2024-08-01 10:50:43 -07:00
Marcel
b78749e01b Merge branch 'coffee-compiler/prevent_empty_server_list_entries' into 'master'
Prevent empty server list entries

See merge request veloren/veloren!4544
2024-08-01 01:07:33 +00:00
coffee-compiler
5c5f33d124 Prevent empty server list entries 2024-08-01 01:07:32 +00:00
Marcel
409852591f Merge branch 'coffee-compiler/fix_wrong_highlight_in_interface_settings' into 'master'
Fix wrong button highlighting in interface settings

See merge request veloren/veloren!4543
2024-07-31 16:05:21 +00:00
coffee-compiler
4505e1d0b7 Fix wrong button highlighting in interface settings 2024-07-31 16:05:21 +00:00
Marcel
44150f6540 Merge branch 'coffee-compiler/update_crafting_repair_ui' into 'master'
Reworked repair equipment interface in crafting menu

See merge request veloren/veloren!4541
2024-07-31 13:04:13 +00:00
coffee-compiler
7a3f3cc555 Reworked repair equipment interface in crafting menu 2024-07-31 13:04:12 +00:00
Marcel
366cf18603 Merge branch 'coffee-compiler/fix_server_list_panic' into 'master'
Fix crash on server list entry deletion

See merge request veloren/veloren!4540
2024-07-31 07:41:35 +00:00
coffee-compiler
15eeab7405 Fix crash on server list entry deletion 2024-07-31 07:41:35 +00:00
crabman
126f9f8502 Merge branch 'coffee-compiler/give_item_cmd_success_msg' into 'master'
Receive server message on give_item cmd success

See merge request veloren/veloren!4539
2024-07-30 18:21:18 +00:00
coffee-compiler
c64bddee68 Receive server message on give_item cmd success 2024-07-30 18:21:18 +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
Marcel
f06440b2c3 Merge branch 'coffee-compiler/localize_pseudo_recipes' into 'master'
Localize pseudo recipes

See merge request veloren/veloren!4537
2024-07-29 14:44:01 +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
Marcel
5ede03222d Merge branch 'coffee-compiler/fix_crafting_instructions_overflow' into 'master'
Fix modular weapon crafting instructions overflow

See merge request veloren/veloren!4536
2024-07-28 20:47:46 +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
Marcel
e70a0f3132 Merge branch 'coffee-compiler/localize_item_amount' into 'master'
Localize item amount

See merge request veloren/veloren!4534
2024-07-27 21:51:09 +00:00
coffee-compiler
009ca07303 Localize item amount 2024-07-27 21:51:09 +00:00
Marcel
127c0ce0aa Merge branch 'coffee-compiler/fix_translation_script' into 'master'
Fix bin reference in gitlab translation script

See merge request veloren/veloren!4531
2024-07-23 19:09:36 +00:00
coffee-compiler
c4a3548359 Fix bin reference in gitlab translation script 2024-07-23 19:09:36 +00:00
Marcel
fc8ea37762 Merge branch 'coffee-compiler/remove_single_file_binary_folders' into 'master'
Remove single file binary folders

See merge request veloren/veloren!4530
2024-07-23 11:59:15 +00:00
coffee-compiler
007397c644 Remove single file binary folders 2024-07-23 11:59:15 +00:00
Marcel
053416c066 Merge branch 'coffee-compiler/module_structure' into 'master'
Comply to new module structure convention

See merge request veloren/veloren!4527
2024-07-22 10:29:30 +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