Commit Graph

15571 Commits

Author SHA1 Message Date
Sam
b8de5e414b Helm Crusher 2024-04-28 19:40:12 -04:00
Sam
38c74bf182 Finish rooted debuff impl and Lung Pummel 2024-04-28 19:40:12 -04:00
Sam
76dc196996 Pile Driver 2024-04-28 19:40:12 -04:00
Sam
90f3b671c3 Breach 2024-04-28 19:40:12 -04:00
Sam
7ed66f29bf Spine Cracker 2024-04-28 19:40:12 -04:00
Sam
c9c14c9202 Retaliate 2024-04-28 19:40:12 -04:00
Sam
e858b84427 Intercept 2024-04-28 19:40:11 -04:00
Sam
e24ebc381b Heavy whorl 2024-04-28 19:40:11 -04:00
Sam
909363d33c Vigorous bash 2024-04-28 19:40:11 -04:00
Sam
89048e9530 Tremor 2024-04-28 19:36:17 -04:00
Sam
cc70685f7a Scornful swipe 2024-04-28 19:36:17 -04:00
Sam
af755197bb Wide wallop 2024-04-28 19:36:16 -04:00
Sam
bddced1ab7 Solid smash 2024-04-28 19:36:16 -04:00
Sam
fcfff367c9 Cleanup stuff from old hammer 2024-04-28 19:36:14 -04:00
Sam
78acdcf767 Placeholder UI for skill tree 2024-04-28 19:35:12 -04:00
Sam
09b25d4f74 Initial setup 2024-04-28 19:35:12 -04:00
flo
8fd6216e39 Merge branch 'mine-implementation' into 'master'
mine-implementation

See merge request veloren/veloren!4262
2024-04-28 19:31:18 +00:00
flo
961f49e2af mine-implementation 2024-04-28 19:31:18 +00:00
crabman
81fea8acb4 Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4439
2024-04-24 17:32:44 +00:00
Otto Richter
80bc0156a0 Update translation files (Weblate) 2024-04-24 17:32:44 +00:00
Christof Petig
cdc1799012 Merge branch 'crabman/revive_test_server' into 'master'
Revive test-server

See merge request veloren/veloren!4353
2024-04-21 13:09:11 +00:00
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