Commit Graph

15750 Commits

Author SHA1 Message Date
crabman
e6a9d4434f
fix test-server compile warnings 2024-04-21 09:48:35 +00:00
crabman
a78ad8de79
revive test-server 2024-04-21 09:34:08 +00:00
crabman
52a9cac813 Merge branch 'crabman/loot-protection-fix' into 'master'
Fix loot protection bugs

See merge request veloren/veloren!4437
2024-04-20 09:52:06 +00:00
crabman
45ed480d26
changelog entry 2024-04-20 09:21:39 +00:00
crabman
68c53a7d1c
Fix loot protection bugs
This fixes:
- Giving loot protection to the entity to be destroyed instead of the
  one who killed it.
- Checking the destroyed entity for non-humanoid body instead of the
  entity receiving loot when deciding whether loot protection should be
  given or not.
- Incorrect assumption that NPC groups are tracked in the group
  manager when cleaning up loot protections.
2024-04-20 09:21:01 +00:00
crabman
09b5aa6145 Merge branch 'miocore/controls_settings_m1m2' into 'master'
remove keybind_mode, instead use m1 for set and m2 for unset

See merge request veloren/veloren!4432
2024-04-19 22:30:34 +00:00
miocore
8710aaa07b remove keybind_mode, instead use left click(m1) for set and right click(m2) for unset 2024-04-20 00:57:30 +03:00
Treeco
a019eceb06 Merge branch 'treeco/tree-tweaks' into 'master'
Changed redwood and oaklike tree configs

See merge request veloren/veloren!4435
2024-04-19 10:27:34 +00:00
Treeco
e03426316d Changed redwood and oaklike tree configs 2024-04-19 01:05:56 +01:00
crabman
fb99defffc Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4434
2024-04-17 18:31:04 +00:00
Codeberg Translate
36fb95264b
Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.6% (71 of 72 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 35.1% (116 of 330 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 38.3% (109 of 284 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (99 of 99 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (62 of 62 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (161 of 161 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (145 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 70.7% (70 of 99 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (18 of 18 strings)

Translated using Weblate (German)

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (German)

Currently translated at 10.2% (29 of 283 strings)

Translated using Weblate (Russian)

Currently translated at 27.2% (9 of 33 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Russian)

Currently translated at 27.2% (9 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 27.2% (9 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 24.2% (8 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 24.2% (8 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 21.2% (7 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 21.2% (7 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 18.1% (6 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 18.1% (6 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 15.1% (5 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 15.1% (5 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 9.0% (3 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 9.0% (3 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 6.0% (2 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 6.0% (2 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 3.0% (1 of 33 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (2 of 2 strings)

Translated using Weblate (Belarusian)

Currently translated at 86.3% (126 of 146 strings)

Translated using Weblate (Portuguese)

Currently translated at 50.0% (1 of 2 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 4.8% (7 of 145 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 20.1% (57 of 283 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 9.0% (9 of 99 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (11 of 11 strings)

Translated using Weblate (Belarusian)

Currently translated at 83.5% (122 of 146 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 17.3% (49 of 283 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 9.0% (3 of 33 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (14 of 14 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (Belarusian)

Currently translated at 37.4% (106 of 283 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (18 of 18 strings)

Translated using Weblate (Belarusian)

Currently translated at 10.2% (15 of 146 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (62 of 62 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 80.1% (117 of 146 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (161 of 161 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (164 of 164 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (72 of 72 strings)

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 60.9% (89 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 60.9% (89 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 56.1% (82 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 56.1% (82 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 46.5% (68 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 46.5% (68 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 46.5% (68 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (20 of 20 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (29 of 29 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (29 of 29 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (20 of 20 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (164 of 164 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2 of 2 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (18 of 18 strings)

Translated using Weblate (Belarusian)

Currently translated at 36.3% (12 of 33 strings)

Translated using Weblate (Spanish)

Currently translated at 99.1% (119 of 120 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Spanish)

Currently translated at 99.1% (119 of 120 strings)

Translated using Weblate (Spanish)

Currently translated at 99.1% (119 of 120 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (283 of 283 strings)

Translated using Weblate (Spanish)

Currently translated at 96.6% (116 of 120 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (283 of 283 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (283 of 283 strings)

Translated using Weblate (Spanish)

Currently translated at 99.6% (282 of 283 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (252 of 252 strings)

Translated using Weblate (Belarusian)

Currently translated at 16.6% (3 of 18 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (38 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (11 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (11 of 11 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (7 of 7 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (Belarusian)

Currently translated at 40.3% (25 of 62 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (78 of 78 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Belarusian)

Currently translated at 76.5% (36 of 47 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (68 of 68 strings)

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 90.9% (10 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 90.9% (10 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 54.5% (6 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 54.5% (6 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 45.4% (5 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 45.4% (5 of 11 strings)

Translated using Weblate (Belarusian)

Currently translated at 50.0% (19 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 9.0% (1 of 11 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translated using Weblate (Belarusian)

Currently translated at 47.3% (18 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 90.0% (27 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 90.0% (27 of 30 strings)

Translated using Weblate (Belarusian)

Currently translated at 44.7% (17 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 83.3% (25 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 83.3% (25 of 30 strings)

Translated using Weblate (Belarusian)

Currently translated at 44.7% (17 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 73.3% (22 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 73.3% (22 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 70.0% (21 of 30 strings)

Translated using Weblate (Belarusian)

Currently translated at 42.1% (16 of 38 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 43.3% (13 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (17 of 17 strings)

Translated using Weblate (Belarusian)

Currently translated at 39.4% (15 of 38 strings)

Translated using Weblate (Belarusian)

Currently translated at 31.8% (90 of 283 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 36.6% (11 of 30 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 36.6% (11 of 30 strings)

Co-authored-by: Alderador <Alderador@users.noreply.translate.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: FelipePardim <FelipePardim@users.noreply.translate.codeberg.org>
Co-authored-by: Furrior <Furrior@users.noreply.translate.codeberg.org>
Co-authored-by: Kretka <Kretka@users.noreply.translate.codeberg.org>
Co-authored-by: Positron832 <Positron832@users.noreply.translate.codeberg.org>
Co-authored-by: RyanOrigins <RyanOrigins@users.noreply.translate.codeberg.org>
Co-authored-by: Sovenok-Hacker <Sovenok-Hacker@users.noreply.translate.codeberg.org>
Co-authored-by: Thiagod86 <Thiagod86@users.noreply.translate.codeberg.org>
Co-authored-by: dyegomb <dyegomb@users.noreply.translate.codeberg.org>
Co-authored-by: evgenkot <evgenkot@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: loglizzy <loglizzy@users.noreply.translate.codeberg.org>
Co-authored-by: nwildner <nwildner@users.noreply.translate.codeberg.org>
Co-authored-by: walpo <walpo@users.noreply.translate.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/admin/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor-other/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/food/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/key/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/musical_instrument/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/projectile/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/projectile/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/tool/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/tool/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-modular/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-primary/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-secondary/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-secondary/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-secondary/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/ru/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-body/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-char_selection/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-gameinput/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-ability/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-char_window/ru/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-crafting/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-quest/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-sct/pt/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-sct/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-skills/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-skills/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/es/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-trade/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/pt_BR/
Translation: Veloren/admin
Translation: Veloren/armor
Translation: Veloren/armor-other
Translation: Veloren/crafting
Translation: Veloren/food
Translation: Veloren/key
Translation: Veloren/musical_instrument
Translation: Veloren/potion
Translation: Veloren/projectile
Translation: Veloren/tool
Translation: Veloren/voxygen-body
Translation: Veloren/voxygen-char_selection
Translation: Veloren/voxygen-common
Translation: Veloren/voxygen-gameinput
Translation: Veloren/voxygen-hud-ability
Translation: Veloren/voxygen-hud-char_window
Translation: Veloren/voxygen-hud-crafting
Translation: Veloren/voxygen-hud-misc
Translation: Veloren/voxygen-hud-quest
Translation: Veloren/voxygen-hud-sct
Translation: Veloren/voxygen-hud-settings
Translation: Veloren/voxygen-hud-skills
Translation: Veloren/voxygen-hud-subtitles
Translation: Veloren/voxygen-hud-trade
Translation: Veloren/voxygen-main
Translation: Veloren/voxygen-npc
Translation: Veloren/weapon
Translation: Veloren/weapon-modular
Translation: Veloren/weapon-primary
Translation: Veloren/weapon-secondary
2024-04-17 18:01:28 +00:00
crabman
d5522b0401 Merge branch 'crabman/misc' into 'master'
Add take_amount method to inventory

See merge request veloren/veloren!4224
2024-04-16 20:35:30 +00:00
crabman
fcfdfc2db1 Merge branch 'crabman/skate-fix' into 'master'
Avoid unchecked clamp in skate character state

See merge request veloren/veloren!4433
2024-04-16 14:28:34 +00:00
crabman
a970b307f8
address review comments 2024-04-16 12:19:12 +00:00
crabman
45965d5d5b
handle overflow correctly in Inventory::push 2024-04-16 12:19:12 +00:00
crabman
9553ba3e10
fix trade DoS 2024-04-16 12:19:12 +00:00
crabman
76f48a5bf4
Avoid unchecked clamp in skate character state 2024-04-15 21:12:58 +00:00
crabman
7c7f737118 Merge branch 'crabman/sprite-attribute-configs' into 'master'
Define different sprite configurations per-attributes

See merge request veloren/veloren!4359
2024-04-15 16:41:28 +00:00
crabman
4d72152e4a
changelog entry 2024-04-15 16:09:25 +00:00
crabman
4781134d7e
Define different sprite configurations per-attributes 2024-04-15 16:07:35 +00:00
Isse
bedb46ac48 Merge branch 'isse/fix-sprite-pushing' into 'master'
Fix sprite pushing offset in shader

See merge request veloren/veloren!4431
2024-04-15 13:40:57 +00:00
Isse
68f3c34fc4
fix sprite offset 2024-04-15 14:29:41 +02:00
crabman
2124c8137b Merge branch 'abyssal-rings' into 'master'
Abyssal rings

See merge request veloren/veloren!4430
2024-04-15 11:00:43 +00:00
ryan necti
4adbd0dba3 Abyssal rings 2024-04-15 11:00:42 +00:00
crabman
e160fca7d7 Merge branch 'uniior/furniture' into 'master'
More new furniture sprites

See merge request veloren/veloren!4428
2024-04-13 16:16:20 +00:00
Uniior
1bd4539670 More new furniture sprites 2024-04-13 16:16:20 +00:00
Joshua Barretto
8140fd927a Merge branch 'x7cfe/improve_npc_goto' into 'master'
Improve long distance path-finding if target chunk is unloaded

See merge request veloren/veloren!4421
2024-04-12 17:28:22 +00:00
Marcel
e7d3ef76e1 Merge branch 'lunareclipse/update-codeowners' into 'master'
Updated CODEOWNERS

See merge request veloren/veloren!4414
2024-04-11 17:36:22 +00:00
Marcel
43fc86ed9c Merge branch 'walpo/misc-changes' into 'master'
Small miscellaneous changes

See merge request veloren/veloren!4410
2024-04-11 14:46:47 +00:00
Javier Pérez
f2278dae6b Small miscellaneous changes 2024-04-11 14:46:46 +00:00
crabman
7a0b3bff5b Merge branch 'merchant-balance' into 'master'
balancing unsellable material prices

See merge request veloren/veloren!4426
2024-04-11 05:12:28 +00:00
ryan necti
409da2f5da balancing unsellable material prices 2024-04-11 05:12:28 +00:00
crabman
b76b912dcc Merge branch 'weblate-translation' into 'master'
Translated using Weblate (French)

See merge request veloren/veloren!4427
2024-04-10 17:05:40 +00:00
Codeberg Translate
546d1871db
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 70.8% (114 of 161 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 70.8% (114 of 161 strings)

Translated using Weblate (Belarusian)

Currently translated at 31.4% (89 of 283 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (78 of 78 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (40 of 40 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 49.6% (80 of 161 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 49.6% (80 of 161 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (35 of 35 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (32 of 32 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (32 of 32 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (32 of 32 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (39 of 39 strings)

Translated using Weblate (French)

Currently translated at 97.2% (70 of 72 strings)

Translated using Weblate (French)

Currently translated at 55.8% (81 of 145 strings)

Translated using Weblate (French)

Currently translated at 55.8% (81 of 145 strings)

Translated using Weblate (French)

Currently translated at 55.8% (81 of 145 strings)

Translated using Weblate (French)

Currently translated at 53.1% (77 of 145 strings)

Translated using Weblate (French)

Currently translated at 53.1% (77 of 145 strings)

Translated using Weblate (French)

Currently translated at 53.0% (150 of 283 strings)

Translated using Weblate (French)

Currently translated at 33.1% (48 of 145 strings)

Translated using Weblate (French)

Currently translated at 50.1% (142 of 283 strings)

Translated using Weblate (French)

Currently translated at 47.7% (135 of 283 strings)

Translated using Weblate (Belarusian)

Currently translated at 20.1% (57 of 283 strings)

Translated using Weblate (French)

Currently translated at 47.3% (134 of 283 strings)

Translated using Weblate (French)

Currently translated at 97.4% (38 of 39 strings)

Translated using Weblate (French)

Currently translated at 32.4% (47 of 145 strings)

Translated using Weblate (French)

Currently translated at 32.4% (47 of 145 strings)

Translated using Weblate (French)

Currently translated at 21.3% (31 of 145 strings)

Translated using Weblate (French)

Currently translated at 21.3% (31 of 145 strings)

Translated using Weblate (German)

Currently translated at 100.0% (72 of 72 strings)

Translated using Weblate (French)

Currently translated at 20.6% (30 of 145 strings)

Translated using Weblate (French)

Currently translated at 20.0% (29 of 145 strings)

Translated using Weblate (Belarusian)

Currently translated at 17.6% (50 of 283 strings)

Translated using Weblate (French)

Currently translated at 83.8% (52 of 62 strings)

Translated using Weblate (French)

Currently translated at 83.8% (52 of 62 strings)

Translated using Weblate (French)

Currently translated at 100.0% (40 of 40 strings)

Translated using Weblate (French)

Currently translated at 100.0% (40 of 40 strings)

Translated using Weblate (French)

Currently translated at 100.0% (20 of 20 strings)

Translated using Weblate (French)

Currently translated at 97.1% (69 of 71 strings)

Translated using Weblate (French)

Currently translated at 20.0% (29 of 145 strings)

Translated using Weblate (French)

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (Belarusian)

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (18 of 18 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Ukrainian)

Currently translated at 12.1% (12 of 99 strings)

Translated using Weblate (Ukrainian)

Currently translated at 93.3% (28 of 30 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (German)

Currently translated at 100.0% (18 of 18 strings)

Translated using Weblate (French)

Currently translated at 19.0% (54 of 283 strings)

Translated using Weblate (French)

Currently translated at 14.1% (14 of 99 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Swedish)

Currently translated at 96.9% (32 of 33 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (35 of 35 strings)

Translated using Weblate (Swedish)

Currently translated at 88.2% (128 of 145 strings)

Added translation using Weblate (Swedish)

Added translation using Weblate (Swedish)

Added translation using Weblate (Swedish)

Added translation using Weblate (Norwegian Bokmål)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Ukrainian)

Translated using Weblate (Ukrainian)

Currently translated at 90.9% (10 of 11 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (14 of 14 strings)

Translated using Weblate (Ukrainian)

Currently translated at 75.0% (6 of 8 strings)

Translated using Weblate (Ukrainian)

Currently translated at 83.8% (52 of 62 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (164 of 164 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (71 of 71 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (68 of 68 strings)

Added translation using Weblate (Russian)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Ukrainian)

Translated using Weblate (French)

Currently translated at 16.9% (48 of 283 strings)

Translated using Weblate (French)

Currently translated at 100.0% (120 of 120 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (164 of 164 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (164 of 164 strings)

Translated using Weblate (Belarusian)

Currently translated at 76.5% (36 of 47 strings)

Translated using Weblate (Belarusian)

Currently translated at 44.1% (30 of 68 strings)

Translated using Weblate (Ukrainian)

Currently translated at 62.5% (5 of 8 strings)

Translated using Weblate (French)

Currently translated at 10.9% (31 of 283 strings)

Translated using Weblate (German)

Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (Ukrainian)

Currently translated at 64.7% (11 of 17 strings)

Translated using Weblate (German)

Currently translated at 100.0% (17 of 17 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (French)

Currently translated at 83.8% (52 of 62 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.1% (119 of 120 strings)

Translated using Weblate (French)

Currently translated at 96.6% (116 of 120 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translated using Weblate (Ukrainian)

Currently translated at 96.3% (158 of 164 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (French)

Currently translated at 19.3% (28 of 145 strings)

Translated using Weblate (French)

Currently translated at 100.0% (68 of 68 strings)

Translated using Weblate (French)

Currently translated at 100.0% (68 of 68 strings)

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (German)

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: FelipePardim <FelipePardim@users.noreply.translate.codeberg.org>
Co-authored-by: Furrior <Furrior@users.noreply.translate.codeberg.org>
Co-authored-by: GGTheTranslator <GGTheTranslator@users.noreply.translate.codeberg.org>
Co-authored-by: Kretka <Kretka@users.noreply.translate.codeberg.org>
Co-authored-by: LS-Localicows <LS-Localicows@users.noreply.translate.codeberg.org>
Co-authored-by: Positron832 <Positron832@users.noreply.translate.codeberg.org>
Co-authored-by: Sinari <Sinari@users.noreply.translate.codeberg.org>
Co-authored-by: Thiagod86 <Thiagod86@users.noreply.translate.codeberg.org>
Co-authored-by: Witch <Witch@users.noreply.translate.codeberg.org>
Co-authored-by: bov <bov@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: kurtinge <kurtinge@users.noreply.translate.codeberg.org>
Co-authored-by: nwildner <nwildner@users.noreply.translate.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/admin/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/admin/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/crafting/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/food/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/key/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/musical_instrument/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/musical_instrument/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/projectile/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/projectile/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/tool/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-secondary/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon-secondary/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-body/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-body/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-buff/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-buff/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-common/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-gameinput/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-ability/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-ability/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-bag/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-bag/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-chat/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-crafting/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-crafting/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-map/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-map/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/de/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-sct/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-settings/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-skills/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-social/pt_BR/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/sv/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-trade/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-trade/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/be/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/uk/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/fr/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/uk/
Translation: Veloren/admin
Translation: Veloren/armor
Translation: Veloren/crafting
Translation: Veloren/food
Translation: Veloren/key
Translation: Veloren/musical_instrument
Translation: Veloren/potion
Translation: Veloren/projectile
Translation: Veloren/tool
Translation: Veloren/voxygen-body
Translation: Veloren/voxygen-buff
Translation: Veloren/voxygen-common
Translation: Veloren/voxygen-gameinput
Translation: Veloren/voxygen-hud-ability
Translation: Veloren/voxygen-hud-bag
Translation: Veloren/voxygen-hud-chat
Translation: Veloren/voxygen-hud-crafting
Translation: Veloren/voxygen-hud-map
Translation: Veloren/voxygen-hud-misc
Translation: Veloren/voxygen-hud-sct
Translation: Veloren/voxygen-hud-settings
Translation: Veloren/voxygen-hud-skills
Translation: Veloren/voxygen-hud-social
Translation: Veloren/voxygen-hud-subtitles
Translation: Veloren/voxygen-hud-trade
Translation: Veloren/voxygen-main
Translation: Veloren/voxygen-npc
Translation: Veloren/weapon
Translation: Veloren/weapon-secondary
2024-04-10 16:30:06 +00:00
crabman
46f1de1c95 Merge branch 'horblegorble/armor-for-trolls' into 'master'
give generic armor to mountain and swamp trolls

See merge request veloren/veloren!4424
2024-04-10 09:39:30 +00:00
horblegorble
d35b9cfc48 give generic armor to mountain and swamp trolls 2024-04-10 19:04:42 +10:00
Dmitry Kashitsyn
302018c3aa
Remove accidentally leftout wip 2024-04-10 00:44:53 +05:00
Dmitry Kashitsyn
0d87154e6c
Increase probability of random rerouting 2024-04-09 15:06:37 +05:00
Dmitry Kashitsyn
c8f39e3beb
Fix NPC navigation near obstacles
Unwalkable obstacles, such as walls or open space can affect path-finding.
We need to use precise calculation to avoid NPC being stuck in corser and
near sharp turns.
2024-04-09 14:45:51 +05:00
crabman
686343f1d5 Merge branch 'horblegorble/biped-large-tweak' into 'master'
horblegorble/biped-large-tweak

See merge request veloren/veloren!4419
2024-04-09 05:41:10 +00:00
crabman
269e5ed713 Merge branch 'necti-brinestone-cost-increase' into 'master'
Necti brinestone cost increase

See merge request veloren/veloren!4418
2024-04-09 05:38:19 +00:00
ryan necti
f1a2f090eb Necti brinestone cost increase 2024-04-09 05:38:19 +00:00
Dmitry Kashitsyn
529bcd7119
Remove now unused constant 2024-04-08 22:28:21 +05:00
Dmitry Kashitsyn
c85e38b9b2
Add changelog entry 2024-04-08 21:21:08 +05:00
Dmitry Kashitsyn
ae652eef85
Improve long distance path-finding if target chunk is unloaded 2024-04-08 21:14:48 +05:00
Marcel
95cddc6b63 Merge branch 'treeco/fix-audio-panic' into 'master'
Fix Rodio panic

See merge request veloren/veloren!4420
2024-04-08 15:52:41 +00:00
Treeco
8a9ba69bae Fix Rodio panic 2024-04-08 13:18:07 +01:00
horblegorble
4f984f1f44 remove poise res from generic and tursus armors; decrease wendigo hp 2024-04-08 17:46:48 +10:00
horblegorble
23583f3298 use tursus values for generic biped large armour; slight increase to wild large biped hp 2024-04-08 15:36:59 +10:00
horblegorble
245fbed294 use tursus values for generic biped large armour; slight increase to wild large biped hp 2024-04-08 15:33:21 +10:00