Marcel
|
2c1a141fd8
|
Merge branch 'a1phyr/assets_manager_0.12' into 'master'
Update `assets_manager` to 0.12
See merge request veloren/veloren!4566
|
2024-08-28 16:47:43 +00:00 |
|
Marcel
|
5fddb29001
|
Merge branch 'xMAC94x/fix_quinn_panic' into 'master'
with the new rustls 0.23 update, we had call a Cryptprovider, HostEZ notified...
See merge request veloren/veloren!4499
|
2024-08-27 22:34:02 +00:00 |
|
Benoît du Garreau
|
608bc8ac56
|
Update assets_manager to 0.12
|
2024-08-27 22:36:09 +02:00 |
|
Marcel Märtens
|
3bc59ed42f
|
with the new rustls 0.23 update, we had call a Cryptprovider, HostEZ notified us about a client panic when usiong srv
Voxygen has paniced: rustls default CryptoProvider not set.
srv entries:
SRV _veloren_tcp.veloren 0 0 14004 veloren.hostez.io
SRV _veloren_udp.veloren 0 0 14004 veloren.hostez.io
|
2024-08-27 09:40:24 +02:00 |
|
Samuel Keiffer
|
bc4c7dcd5d
|
Merge branch 'coffee-compiler/rename_diary_shortcut' into 'master'
Rename game input for spellbook to diary
See merge request veloren/veloren!4564
|
2024-08-25 20:45:26 +00:00 |
|
coffee-compiler
|
3541d2871b
|
Rename game input for spellbook to diary
|
2024-08-25 20:45:26 +00:00 |
|
Marcel
|
e34ceeae5d
|
Merge branch 'coffee-compiler/use_content_plain_explicitly' into 'master'
Use Content::Plain explicitly
See merge request veloren/veloren!4565
|
2024-08-25 17:18:30 +00:00 |
|
coffee-compiler
|
5a69587c92
|
Use Content::Plain explicitly
|
2024-08-25 17:18:30 +00:00 |
|
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 |
|