Commit Graph

2974 Commits

Author SHA1 Message Date
Illia Denysenko
a2d52d09fc Merge branch 'juliancoffee/i18n-gender-chat' into 'master'
First step to enabling grammatical genders

See merge request veloren/veloren!4301
2024-02-04 17:40:08 +00:00
Illia Denysenko
c645031c3f Merge branch 'juliancoffee/articled-bodies' into 'master'
Improve translator documentation and wording

See merge request veloren/veloren!4303
2024-02-04 16:34:36 +00:00
Francesco Vasco
7870548746 Italian translation 2024-02-04 14:12:02 +01:00
juliancoffee
ffa031d1bd Specify context of messages 2024-02-04 00:21:21 +02:00
juliancoffee
e5c2ee6b23 Improve translator documentation and wording 2024-02-04 00:11:49 +02:00
juliancoffee
273ac621a9 (i18n) Ukrainian translation for chat uses genders 2024-02-03 18:58:46 +02:00
juliancoffee
450de681e4 Refactor chat message i18n
- All message types now use i18n to declare format, similar to /tell
- hud-chat-you is removed for now, along with its usage in
  insert_alias()
2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
juliancoffee
13011606d9 Reorganize hud/chat i18n file 2024-02-03 18:58:46 +02:00
Animoe
dfa184657c Translation:add some new translations for menu and hud 2024-02-03 13:41:13 +00:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master'
Update wgpu

See merge request veloren/veloren!4245
2024-02-01 12:14:32 +00:00
Isse
b7a56e895a Only show available present modes in graphic settings 2024-02-01 12:05:06 +01:00
Animoe
5ba6ba7ac9 update zh-Hans item translations 2024-01-31 15:30:47 +00:00
Illia Denysenko
36bd96e116 Merge branch 'fvasco-item' into 'master'
Add assets/voxygen/i18n/it/item/

See merge request veloren/veloren!4272
2024-01-30 22:25:38 +00:00
Isse
9903d2c545 more testing 2024-01-30 00:52:49 +01:00
flo666
7714bd0445 sea_decor_block_fix 2024-01-26 18:41:24 +01:00
Illia Denysenko
353351e16a Update translation files 2024-01-26 00:01:07 +00:00
maxicarlos08
880e9044d5 Merge branch 'burnpot-model' into 'master'
New bed and door sprites

See merge request veloren/veloren!4184
2024-01-25 21:12:36 +00:00
Illia Denysenko
4ab0717e71 Translated using Weblate (Spanish (Latin America)) 2024-01-25 20:36:52 +00:00
unknown
47694f6896 Updated bed sprite offsets 2024-01-25 15:54:07 -03:00
unknown
928a3bb6ca New bed and door sprites 2024-01-25 14:42:42 -03:00
unknown
962bbcb045 Update Burning Potion model 2024-01-25 14:37:26 -03:00
Francesco Vasco
ac3b67bbdb Add assets/voxygen/i18n/it/item/ 2024-01-25 08:33:35 +01:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Illia Denysenko
5137966940 Merge branch 'evgenkot/follow-up-processing-of-i18n-items' into 'master'
i18n items processing

See merge request veloren/veloren!4260
2024-01-21 18:45:08 +00:00
Evgen Kot
7ea133e4b5 Correcting comments for i18n changes and moving debug.ftl to admin.ftl 2024-01-21 22:03:17 +05:00
Evgen Kot
5a1efcc964 Move npc and unused armor to npc.ftl and lanterns, bags, gliders to other.ftl 2024-01-21 21:33:44 +05:00
evgenkot
7fb8506565 Split i18n items by category 2024-01-21 21:29:27 +05:00
evgenkot
799d636833 Change names of items with the same vox descriptor
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
2024-01-21 21:21:10 +05:00
Maxicarlos08
0b1f8dc29a
add charm buff icons 2024-01-21 15:05:31 +01:00
Marcel
d4f993ca1d Merge branch 'minor-fixes' into 'master'
Correct/improve some en-US text.

See merge request veloren/veloren!4246
2024-01-21 10:12:20 +00:00
flo666
a849286563 fix_adlet_elder_sword 2024-01-20 21:07:38 +01:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Isse
99154897b2 Merge branch 'fvasco-command' into 'master'
Add assets/voxygen/i18n/it/command.ftl

See merge request veloren/veloren!4124
2024-01-18 18:00:51 +00:00
Francesco Vasco
0e9630bd13 Add assets/voxygen/i18n/it/command.ftl 2024-01-18 18:00:51 +00:00
Codeberg Translate
b91d37a5ee
Update translation files
Updated by "Squash Git commits" hook in Weblate.

Translation: Veloren/voxygen-hud-subtitles
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/
2024-01-17 18:56:43 +00:00
Codeberg Translate
ff73a9b3cc
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/voxygen-npc/
Translation: Veloren/voxygen-npc
2024-01-17 18:56:43 +00:00
Joshua Barretto
a852298010 Merge branch 'zesterer/better-char-select-scene' into 'master'
Render render LoD terrain on char select, remove old backdrop figure

See merge request veloren/veloren!4254
2024-01-16 18:51:04 +00:00
Isse
4f084506c0 Merge branch 'juliancoffee/item-i18n' into 'master'
Add Item i18n

Closes #903

See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
Joshua Barretto
d51b5c5bea Add airship to char select 2024-01-15 22:35:42 +00:00
Joshua Barretto
43d935a150 Render render LoD terrain on char select, remove old backdrop figure 2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server 2024-01-15 00:02:43 +01:00
juliancoffee
28b400825e Add item localization assets 2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558 Implement item localization
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
  try_all_item_defs() covers only items in asset folder.

Required assets will go in next commit
2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
juliancoffee
296f70c1b2 Unify /buff_complex and /buff
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40 Add /buff_complex command 2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175 Warn about complex buffs when using /buff 2024-01-08 20:13:17 +02:00
Isse
12a4c5a256 Merge branch 'the_dimasmith/update-uk' into 'master'
update Ukrainian translation

See merge request veloren/veloren!4215
2024-01-08 16:39:08 +00:00
Dmytro Kovalchuk
95f63e46e6 update Ukrainian translation 2024-01-08 16:39:08 +00:00
Darren Salt
7051ba5c89 Correct/improve some en-US text. 2024-01-05 11:47:27 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Isse
100568f955 Merge branch 'feat/time_length_on_map_settings' into 'master'
Feat: Day duration slider on map creation UI (#1909)

Closes #1909

See merge request veloren/veloren!4204
2024-01-03 22:21:53 +00:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Darren Salt
dc0725e104 Avoid a wgpu SPIR-V warning about BitFieldUExtract
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:

WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device:     Proceeding unsafely without validation

This avoids that warning (and removes now-unnecessary type conversions).
2024-01-03 16:33:02 +00:00
Samuel Keiffer
5bd089c56d Merge branch 'sam/remove-combo-melee' into 'master'
Deprecated combo melee character state

See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
DaforLynx
0b62898060 Audio fixes and new music 2023-12-29 00:25:08 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
Froggy
7c66fff767 Froggy/armor offset fixes 2023-12-25 12:14:24 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master'
Christmas theme revival

See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
Froggy
8cfd65ff76 fixed armor offsets to enable mix'n'match armor 2023-12-20 12:05:58 +00:00
Froggy
01ac73b73e fixed headwear offsets and some vox files 2023-12-18 20:42:52 +11:00
do-no-van
b5eaa58728 fix typo and armor offsets 2023-12-17 22:44:43 +00:00
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
783cfdc719 Merge branch 'master' into More-potions 2023-11-27 07:00:48 -04:00
HEIEnthusiast
4d87a9ab44 General potion modifications 2023-11-27 06:57:42 -04:00
HEIEnthusiast
59c3162c49 Merge branch 'master' of https://gitlab.com/veloren/dev/veloren
12 commits behind master fix
2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
5a3e6316a5 fix tethering 2023-11-23 01:01:31 +01:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
d3b3bca621 Added precision 2023-11-14 18:06:59 -05:00
PopeRigby
688fd67c33 Add Burning Potion that applies the Burning effect to the user 2023-11-14 02:00:50 +00:00
Isse
db1480b564 put ice_reflections under REFLECTION_MODE_HIGH 2023-11-10 12:53:09 +01:00
Christof Petig
0ddd40336a Merge branch 'zesterer/worldgen' into 'master'
Various worldgen improvements

See merge request veloren/veloren!4152
2023-11-10 00:15:29 +00:00
Sorann753
a63debe1b7 Fixed French Translation 2023-11-09 19:41:05 +00:00
Joshua Barretto
84e59c52fb Made portal fizz better convey access 2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf Made ice reflective 2023-11-08 23:19:00 +01:00
Uniior
1d8a23c30e Starter glider. 2023-11-04 22:09:00 +00:00
Isse
7a8e363df1 better way to show glitter 2023-11-02 15:22:32 +01:00
Isse
48d95e7699 SnowGlitter experimental shader 2023-11-02 12:53:34 +01:00
Isse
f98e4331a1 Fix LoD reflections for nvidea + vulkan 2023-10-23 19:48:30 +00:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
a5ec81a2ab Better tether pattern, account for mass 2023-10-21 13:51:41 +01:00