Commit Graph

15904 Commits

Author SHA1 Message Date
Illia Denysenko
9971aa26a4 Merge branch 'coffee-compiler/localize_map_shape' into 'master'
Localize map shape for world generation

See merge request veloren/veloren!4563
2024-08-24 08:23:04 +00:00
coffee-compiler
e760d3c1a0 Localize map shape for world generation 2024-08-24 08:23:04 +00:00
Isse
67905d0388 Merge branch 'isse/fix-test-voxygen' into 'master'
Fix `test-voxygen` errors and warnings

See merge request veloren/veloren!4560
2024-08-21 17:04:01 +00:00
Illia Denysenko
488062643b Merge branch 'coffee-compiler/localize_server_command_results' into 'master'
Localize more server command results

See merge request veloren/veloren!4559
2024-08-21 07:36:03 +00:00
coffee-compiler
ffccc81881 Localize more server command results 2024-08-21 07:36:01 +00:00
Marcel
8361d2edfd Merge branch 'matsuuii/fix_case_ignore_in_server_cli' into 'master'
Fix ignore case for admin add command

Closes #2000

See merge request veloren/veloren!4561
2024-08-19 21:55:43 +00:00
Matthew Searle
b04ba00292 Fix ignore case for admin add command 2024-08-19 14:36:58 -06:00
Isse
259fa94d61
use cfg_attr 2024-08-19 21:53:37 +02:00
Isse
6659a512ec
fix test-voxygen errors and warnings 2024-08-19 19:17:40 +02:00
Imbris
676b678b52 Merge branch 'coffee-compiler/cap_long_paste_input' into 'master'
Remove client side chat message capping

See merge request veloren/veloren!4558
2024-08-18 19:10:53 +00:00
coffee-compiler
7c7f2072b5 Remove client side chat message capping 2024-08-18 19:10:53 +00:00
Illia Denysenko
8a96ff715e Merge branch 'coffee-compiler/fix_missing_localization_arg_error' into 'master'
Replace variable key in ftl files

See merge request veloren/veloren!4556
2024-08-18 14:15:17 +00:00
coffee-compiler
60b4e528fe Replace variable key in ftl files 2024-08-18 14:15:16 +00:00
Marcel
b598f38eca Merge branch 'coffee-compiler/restrict_chat_msg_len_client' into 'master'
Restrict chat message length on client side

See merge request veloren/veloren!4557
2024-08-18 11:40:00 +00:00
coffee-compiler
34d6e8d53a Restrict chat message length on client side 2024-08-18 11:39:59 +00:00
Illia Denysenko
b7d3dc998c Merge branch 'coffee-compiler/localize_help_strings' into 'master'
Localize command descriptions & help summaries

See merge request veloren/veloren!4555
2024-08-17 18:12:55 +00:00
coffee-compiler
9e55aaa702 Localize command descriptions & help summaries 2024-08-17 18:12:55 +00:00
crabman
68b74000f7 Merge branch 'coffee-compiler/update_cmd_doc_gen' into 'master'
Update cmd_doc_gen to print client command table as well

See merge request veloren/veloren!4553
2024-08-16 15:32:50 +00:00
coffee-compiler
9d22f79ce0 Update cmd_doc_gen to print client command table as well 2024-08-16 15:32:50 +00:00
crabman
9b58fc650e Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4552
2024-08-15 20:35:46 +00:00
Otto Richter
e968b9002f Update translation files (Weblate) 2024-08-15 20:35:46 +00:00
Marcel
83191551c5 Merge branch 'crab/fix-player-trading' into 'master'
Allow trading from player to player again

See merge request veloren/veloren!4554
2024-08-15 13:44:16 +00:00
crabman
6277e93911
Allow trading from player to player again 2024-08-15 13:19:56 +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