Commit Graph

15781 Commits

Author SHA1 Message Date
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
crabman
4ee31ab020 Merge branch 'newclarityex/petting-animals' into 'master'
newclarityex/petting animals

See merge request veloren/veloren!4408
2024-04-07 15:05:19 +00:00
Kira Lu
5e88b67e0b newclarityex/petting animals 2024-04-07 15:05:18 +00:00
Samuel Keiffer
24e8727355 Merge branch 'srpapinha/buff-parry-block-poise-cost' into 'master'
Buff parry/block poise cost

See merge request veloren/veloren!4401
2024-04-05 00:05:06 +00:00
crabman
332a2a1478 Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4411
2024-04-04 15:10:32 +00:00
crabman
e6e8b246b0 Merge branch 'pyrotechnics' into 'master'
add fireworks and bombs back to chests, sahagin tier and above

See merge request veloren/veloren!4413
2024-04-04 11:14:42 +00:00
horblegorble
c06afb911e change terracotta chest to 60%, single roll 2024-04-04 20:19:09 +10:00
horblegorble
f0e6031eee move inline Lottery to standalone pyrotechnics tatable, include coral chests, scale drop chances across tiers 2024-04-04 19:37:40 +10:00
LunarEclipse
b0dd4e1135 Updated CODEOWNERS 2024-04-04 09:06:27 +02:00
horblegorble
addba2cfda add fireworks and bombs back to chests, sahagin tier and above 2024-04-04 08:11:29 +10:00
Joshua Barretto
2f0c83992f Merge branch 'zesterer/morning-light' into 'master'
More ambient light in morning and evening

See merge request veloren/veloren!3954
2024-04-03 20:23:33 +00:00
crabman
6342288341 Merge branch 'crabman/post-party' into 'master'
tweak chunk and reloading related commands

See merge request veloren/veloren!4409
2024-04-03 18:08:57 +00:00
crabman
59b176a7bb
only attempt to remove empty terrain file if it exists 2024-04-03 18:32:22 +01:00
Codeberg Translate
dcbd7b1873
Update translation files
Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/
Translation: Veloren/armor
Translation: Veloren/voxygen-npc
2024-04-03 14:08:11 +00:00
crabman
5e8de39fd0
address review comments 2024-04-03 12:50:48 +01:00
crabman
10c47128ce
misc post party changes 2024-04-03 12:17:17 +01:00
Joshua Barretto
302e2e92b0 Merge branch 'x7cfe/fix_npc_goto_jump' into 'master'
Fix accidental jump cancellation during dispatch of `NpcActivity::Goto`

See merge request veloren/veloren!4406
2024-04-02 20:28:40 +00:00
Dmitry Kashitsyn
4664f1455f
Reformat the source 2024-04-02 23:32:39 +05:00
Dmitry Kashitsyn
45916d1794
Fix accidental jump cancellation during dispatch of NpcActivity::Goto
`AgentData::jump_if` cancels `InputKind::Jump` if condition
is not met. Even if the jump itself was issued elsewhere.
This prevented merchants and travelers from reaching target site
if somewhere along the path jump is required.

This is exactly what happens during dispatch of `NpcActivity::Goto`.
Original implementation contained `traverse` followed by `jump_if`
for flying NPCs which cancelled pending `InputKind::Jump` issued
by `traverse`.

This fix extends jump condition inside traverse by
including `traversal_config.can_fly`.
2024-04-02 22:16:12 +05:00
crabman
d8bd81357b Merge branch 'easter_and_april_fools_stuff' into 'master'
easter_and_april_fools_stuff

See merge request veloren/veloren!4404
2024-04-01 06:46:43 +00:00