Illia Denysenko
e9a04db92c
Merge branch 'walpo/update-en-translation' into 'master'
...
Update English translation
See merge request veloren/veloren!4339
2024-02-29 23:45:09 +00:00
Javier Pérez
156c6c768c
refactor: replace integer literal with variable
2024-03-01 00:05:45 +01:00
Javier Pérez
27b2709ccb
refactor: make selector consistent
2024-02-29 23:58:59 +01:00
Javier Pérez
5ceedc8448
fix(misc.ftl): separate key from equals sign
2024-02-29 23:43:22 +01:00
Javier Pérez
cbbdf95212
feat(subtitles.ftl): add fluent key
2024-02-29 23:42:10 +01:00
Javier Pérez
2ef9cae614
revert: change 'stamina' to 'energy'
2024-02-29 20:41:25 +01:00
juliancoffee
ddbe1dc0c1
Fix group-comments
2024-02-29 16:05:07 +02:00
crabman
a14c2f054c
addressed review comments
2024-02-28 22:03:35 +00:00
crabman
036e79284e
transform character state
2024-02-28 22:03:35 +00:00
Javier Pérez
497e66d2bb
fix: update social.ftl
2024-02-24 14:31:01 +01:00
Javier Pérez
7cb04a7040
feat: minor adjustments
2024-02-22 22:47:05 +01:00
Javier Pérez
e8c1666d64
feat: update English translation
2024-02-22 19:56:52 +01:00
Samuel Keiffer
94f6c3350c
Merge branch 'danielkenji83/block-based-on-poise' into 'master'
...
Block based on poise
See merge request veloren/veloren!4283
2024-02-21 16:53:24 +00:00
UncomfySilence
f3cc4bf90f
cave and tree distributions and minor tweaks
2024-02-21 12:28:41 +01:00
uniior
ba0db563cc
Address comments
2024-02-20 16:18:02 +01:00
danielkenji83
53fddba3ef
Remove block_strength stat
2024-02-17 13:12:34 -03:00
danielkenji83
5c401215cf
Rebase commit
2024-02-17 00:50:23 -03:00
flo
ed4fd55bc3
terracotta
2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1
Beginner balance tweaks
2024-02-14 23:23:29 +00:00
evgenkot
eb4911f60d
I18n pickup-msg correction for en uk ru
2024-02-12 23:26:14 +05:00
evgenkot
eee330c9e9
I18n loot_scroller correct name
2024-02-12 21:24:57 +05:00
Maxicarlos08
a084351aad
fix incorrect i18 group chat key
2024-02-09 19:57:59 +01:00
Scott Bronson
86ce5960a7
Add hints on how to use animal materials to craft weapons
2024-02-04 17:54:00 -08:00
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
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
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
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
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
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
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
flo
48a79b3e78
haniwa
2024-01-20 17:45:23 +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
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
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
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
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00: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
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
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
Joshua Barretto
9dd5cd24d1
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
2023-10-13 11:57:49 +01:00
Maxicarlos08
a3be68930e
review comments
2023-10-02 23:23:42 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup
2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status
2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen
2023-09-29 23:30:14 +02:00
Laura
f4d48d2689
New Arena building and visit site for NPCs
2023-09-26 12:29:14 +00:00
Maxicarlos08
772dd660a1
testing
2023-09-20 23:29:24 +02:00
Maxicarlos08
91284565a2
addressed review comments
2023-09-20 23:29:24 +02:00
Maxicarlos08
fd42b3f767
localize commands
2023-09-20 23:29:24 +02:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Marcel
1b7d5f0915
Merge branch 'xMAC94x/fluent_stances' into 'master'
...
add back stances removed by weblate
See merge request veloren/veloren!4095
2023-08-31 16:20:43 +00:00
Marcel Märtens
c9a7e6e072
ad back stances removed by weblate, and register them in EN file, hopefully that weblate accepts them now
2023-08-31 15:51:06 +02:00
Xiretza
06111612a3
voxygen: better translation of buff-death messages
...
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.
Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.
```
function getbuff --argument langfile buff
grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end
set buffs burning bleeding curse crippled frozen mysterious
function replacebuffs --argument langfile entity
set slug 'hud-chat-died_of_'$entity'_buff_msg'
for buff in $buffs[-1..1]
set bstr (getbuff $langfile $buff)
or continue
sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
end
sed -i -E 's/('$slug' \=).*/\1/' $langfile
end
function dofile --argument langfile
sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
for entity in pvp npc nonexistent
replacebuffs $langfile $entity
end
sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
sed -i -e /hud-outcome-/d $langfile
sed -i -e '/#.*outcomes/d' $langfile
end
for langfile in assets/voxygen/i18n/*/hud/chat.ftl
echo doing $langfile
dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
Thomas S
4d21fbaea5
add fr translations
2023-08-29 10:14:48 +00:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event
2023-08-19 11:44:58 +02:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666)
2023-08-17 22:47:35 +02:00
Isse
5a9b83aeb0
Merge branch 'evgenkot/si-prefixes-condition' into 'master'
...
Settings for Si prefixes in the interface menu
See merge request veloren/veloren!4061
2023-08-17 15:24:05 +00:00
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Maxicarlos08
ce8be9596b
fix pets not following after making them stay and translation
2023-08-17 12:10:32 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation
2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction
2023-08-15 12:24:49 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying
2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent
2023-08-15 11:10:54 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Youser Nayme
5ef300c72c
Add keybinding for zooming the camera
2023-08-10 16:55:09 +00:00
flo666
607af6f227
shovel sfx & particles
2023-08-03 21:52:55 +02:00
Isse
a39923e4d6
digging shovel
2023-08-03 19:32:09 +02:00
flo
57fe2c4adb
spawn wyverns
2023-08-02 07:55:10 +00:00
DaforLynx
32f3437fb0
Combat music toggle
2023-07-30 08:10:36 +00:00
Sam
d6fcd893bf
Addressed testing feedback
2023-07-29 19:04:10 -04:00
