Commit graph

18477 commits

Author SHA1 Message Date
Marcel
87c63ef827 Merge branch 'neura/nixnixnxixin' into 'master'
build(nix): update/tweak flake deps

See merge request veloren/veloren!5430
2026-08-16 19:19:51 +02:00
Youser Nayme
3aeda2922c
build(nix): update/tweak flake deps 2026-08-16 16:33:06 +00:00
Illia Denysenko
28bd04bae7 Merge branch 'tweak-ic-server-err-msg' into 'master'
i18n: Tweak Mismatched game version message

See merge request veloren/veloren!5410
2026-08-15 20:59:40 +00:00
Illia Denysenko
67ff24195f Merge branch 'sobhan/persian-translation' into 'master'
feat(i18n): Add manifest file for persian

See merge request veloren/veloren!5427
2026-08-15 14:51:10 +00:00
sobhanmohammadi-dev
0b095ce88d feat(i18n): Add manifest file for persian 2026-08-15 02:31:51 +03:00
Limina Wayfarer
6aa812ca3b Merge branch 'weblate-translation' into 'master'
Added translation using Weblate

See merge request veloren/veloren!5426
2026-08-13 01:34:46 +00:00
Marcel
771d8987a3 Merge branch 'neura/xnixnixni' into 'master'
build(nix): update flake inputs and usage

See merge request veloren/veloren!5425
2026-08-12 23:18:29 +02:00
Codeberg Translate
5462ccc7d4
Added translation using Weblate (Persian)
Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Added translation using Weblate (Persian)

Translated using Weblate (Czech)

Currently translated at 100.0% (313 of 313 strings)

Translated using Weblate (Czech)

Currently translated at 38.3% (113 of 295 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (31 of 31 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (115 of 115 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (253 of 253 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (368 of 368 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (109 of 109 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (27 of 27 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (52 of 52 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (34 of 34 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (51 of 51 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (71 of 71 strings)

Added translation using Weblate (Vietnamese)

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Janez <janez@noreply.codeberg.org>
Co-authored-by: SobhanMohammadi <sobhanmohammadi@noreply.codeberg.org>
Co-authored-by: theeasternfurry <theeasternfurry@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor-other/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-primary/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-char_selection/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-command/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-dialogue/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-bag/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-chat/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-crafting/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/cs/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-name/cs/
Translation: Veloren/armor
Translation: Veloren/armor-other
Translation: Veloren/common-command
Translation: Veloren/common-dialogue
Translation: Veloren/common-name
Translation: Veloren/crafting
Translation: Veloren/voxygen-char_selection
Translation: Veloren/voxygen-common
Translation: Veloren/voxygen-hud-bag
Translation: Veloren/voxygen-hud-chat
Translation: Veloren/voxygen-hud-crafting
Translation: Veloren/voxygen-hud-settings
Translation: Veloren/voxygen-main
Translation: Veloren/weapon-primary
2026-08-12 18:53:10 +00:00
Youser Nayme
237ba8181a
build(nix): update flake inputs and usage 2026-08-12 12:54:15 +00:00
Joshua Barretto
7fa1049d06 Merge branch 'hanuko33/particlelimit' into 'master'
add particle chance slider

See merge request veloren/veloren!5422
2026-08-11 19:44:16 +00:00
Hanuko33
55eafe4f21 add particle chance slider 2026-08-11 19:44:16 +00:00
UncomfortableSilence
8c621f0cf7 Merge branch 'hrom/dual-anim-fix' into 'master'
Improve dual wielding animations

See merge request veloren/veloren!5420
2026-08-11 15:40:46 +00:00
DaforLynx
1eb92a76dc Merge branch 'DaforLynx/credit-update' into 'master'
Some audio credit updates

See merge request veloren/veloren!5423
2026-08-09 20:28:52 -07:00
DaforLynx
684739fdab Some audio credit updates 2026-08-09 20:28:51 -07:00
Limina Wayfarer
6364e8052a Merge branch 'weblate-translation' into 'master'
Translated using Weblate

See merge request veloren/veloren!5421
2026-08-05 21:42:49 +00:00
Codeberg Translate
b4b53f4d08
Translated using Weblate (Spanish (Latin America))
Currently translated at 100.0% (123 of 123 strings)

Translated using Weblate (Spanish)

Currently translated at 82.6% (304 of 368 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (196 of 196 strings)

Co-authored-by: Ciclop <ciclop@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-ability/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/es_419/
Translation: Veloren/armor
Translation: Veloren/common-npc
Translation: Veloren/voxygen-hud-ability
Translation: Veloren/voxygen-hud-settings
2026-08-05 17:25:48 +00:00
Hrom
7b996d6a2d Improve dual wielding animations 2026-08-02 13:17:38 +02:00
Imbris
c424a2a8fe Merge branch 'imbris/character-location' into 'master'
Use `Content` for character location names

See merge request veloren/veloren!5412
2026-08-01 14:34:46 +00:00
Joshua Barretto
9f6656c065 Merge branch 'hrom/troll-cave-fix' into 'master'
Fix troll cave model

See merge request veloren/veloren!5419
2026-08-01 07:09:15 +00:00
BKVad1m
21e4dffff3 Add missing string 2026-08-01 11:30:27 +07:00
BKVad1m
e48e97ce46 Merge branch veloren:master into tweak-ic-server-err-msg 2026-08-01 11:28:41 +07:00
Hrom
380ff4c81c Fix troll cave model 2026-07-31 12:57:07 +02:00
Imbris
3eaac9be7a Make running rustfmt directly work (needed for format on save in my editor with new 2024 syntax) 2026-07-30 21:49:33 -04:00
Imbris
e13c4dd9f4 Consistently handle errors when deserializing waypoint data 2026-07-30 21:48:53 -04:00
Samuel Keiffer
dd74369cf8 Merge branch 'uncomfy/minor_charge_tweak' into 'master'
Minor Charge Tweak

See merge request veloren/veloren!5417
2026-07-29 19:36:13 -04:00
UncomfortableSilence
85b8d21cc7 Minor Charge Tweak 2026-07-29 19:36:12 -04:00
Limina Wayfarer
1292019541 Merge branch 'weblate-translation' into 'master'
Translated using Weblate

See merge request veloren/veloren!5418
2026-07-29 18:32:16 +00:00
Codeberg Translate
1ef60328d3
Translated using Weblate (Belarusian)
Currently translated at 96.2% (51 of 53 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (186 of 186 strings)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Added translation using Weblate (Brahui)

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Added translation using Weblate (Brahui)

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Kretka <kretka@noreply.codeberg.org>
Co-authored-by: khangreat <khangreat@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-buff/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-buff/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-ability/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/be/
Translation: Veloren/voxygen-buff
Translation: Veloren/voxygen-hud-ability
Translation: Veloren/voxygen-hud-settings
2026-07-29 17:44:30 +00:00
UncomfortableSilence
0d056e1a04 Merge branch 'unii/pink-shirt' into 'master'
Pink worker shirt variant

See merge request veloren/veloren!5408
2026-07-29 09:04:32 +00:00
Uniior
8d7e7cc389 Pink worker shirt variant 2026-07-29 09:04:31 +00:00
Imbris
77330cd408 Merge branch 'imbris/fix-latest-clippy-changes' into 'master'
Suppress two clippy lints and revert some of their changes

See merge request veloren/veloren!5413
2026-07-27 00:09:22 +00:00
Imbris
2680eac1a9 Use ? in place of multiple and_then calls when fetching multiple components 2026-07-26 19:25:55 -04:00
Imbris
283306780d Suppress two clippy lints and revert some of their changes from the last
toolchain update.

The lints are `collapsible_match` and `manual_option_zip`.

`collapsible_match` made the match arms inconsistent and made them
reliant on being followed by a no-op wildcard arm.

`manual_option_zip` has a bug in our current version where it suggests
transforming conditional calls into unconditional calls.
2026-07-25 19:12:38 -04:00
UncomfortableSilence
91c34392da Merge branch 'uncomfy/fix-staff' into 'master'
Fix Abilities

See merge request veloren/veloren!5411
2026-07-24 18:45:16 +00:00
UncomfortableSilence
244f3f77a4 Fix Abilities 2026-07-24 18:45:16 +00:00
Imbris
52a62b403e Use Content for character location names 2026-07-23 21:52:02 -04:00
BKVad1m
6df278a44f Tweak Mismatched game version message 2026-07-23 15:18:26 +07:00
Joshua Barretto
345e457894 Merge branch 'zesterer/shader-cleanup' into 'master'
Removed old comments from shaders

See merge request veloren/veloren!5407
2026-07-21 22:32:17 +00:00
Joshua Barretto
b5ded782a9 Removed old comments from shaders 2026-07-21 22:20:34 +01:00
Joshua Barretto
652b586e0e Merge branch 'zesterer/lod-voxels' into 'master'
Significantly improved LoD voxel effect, added flat clouds fallback

See merge request veloren/veloren!5400
2026-07-17 22:54:12 +00:00
Joshua Barretto
5c83a21a32 Updated changelog 2026-07-17 23:07:49 +01:00
Joshua Barretto
d661e2fe30 Simplified procedural LoD detail 2026-07-17 22:29:03 +01:00
Joshua Barretto
307a41bf55 Fixed glancing angle voxel_norm 2026-07-17 22:22:34 +01:00
DaforLynx
5fe719e214 Merge branch 'DaforLynx/update-kira-0.12.2' into 'master'
Update kira and cpal

See merge request veloren/veloren!5406
2026-07-17 13:22:36 -07:00
DaforLynx
b57ff85098 Update kira and cpal 2026-07-17 12:33:39 -07:00
crab
106bb9b742 Merge branch 'neura/fix-mouse-rebind' into 'master'
Fix rebinding mouse buttons

See merge request veloren/veloren!5402
2026-07-17 14:05:41 +00:00
Joshua Barretto
859a9b720d Better balance of procedural LoD detail 2026-07-16 22:41:16 +01:00
Joshua Barretto
6008466d4a More precise LoD terrain voxels 2026-07-16 22:19:39 +01:00
Samuel Keiffer
9e9d66075a Merge branch 'bow-tweaks' into 'master'
Bow tweaks

See merge request veloren/veloren!5292
2026-07-16 16:45:14 -04:00
Joshua Barretto
6965d8c1cf Prevented LoD water at grazing angles 2026-07-16 19:49:38 +01:00