Illia Denysenko
9b6c678473
Merge branch 'master' into 'master'
...
Add hints on how to use animal materials to craft weapons
See merge request veloren/veloren!4306
2024-02-06 13:02:48 +00:00
Illia Denysenko
330e5ee3b0
Translated using Weblate
2024-02-05 13:59:08 +00: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
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
BigKhan
9c57a37a58
fixed comma + changelog
2024-01-31 18:27:38 +00:00
BigKhan
5d6d976b7f
removed comment
2024-01-31 16:52:31 +00:00
BigKhan
554e5b6c80
Added Autumn ForestKind
2024-01-31 16:50:13 +00:00
Illia Denysenko
43cbcf2514
Merge branch 'update-zh-Hans' into 'master'
...
update zh-Hans item translations
See merge request veloren/veloren!4294
2024-01-31 15:30:47 +00:00
Animoe
5ba6ba7ac9
update zh-Hans item translations
2024-01-31 15:30:47 +00:00
BigKhan
ee10e03736
wood darker
2024-01-31 13:19:48 +00:00
BigKhan
f600d48e15
Added Cherry Tree ForestKind
2024-01-31 13:15:26 +00:00
maxicarlos08
be056ef595
Merge branch 'AutumnTrees' into 'master'
...
Autumn trees
See merge request veloren/veloren!4284
2024-01-31 11:19:11 +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
BigKhan
7dce9513c1
cleaned description
2024-01-28 14:37:08 +00:00
BigKhan
69f549deab
made the trees maples instead. renamed the ForestKind to match.
2024-01-28 14:34:11 +00:00
BigKhan
9d36a1446d
adding autumn trees to temperate forest
2024-01-27 22:52:57 +00:00
BigKhan
f626fdc496
Added Autumn Trees
2024-01-27 21:12:51 +00: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
maxicarlos08
8d3cd277b9
Merge branch 'jcoxeye/price-entries' into 'master'
...
Lots of price entries for miscellaneous items
See merge request veloren/veloren!4231
2024-01-24 06:57:07 +00:00
maxicarlos08
ef84ab6603
Merge branch 'jcoxeye/item-tiering-fixes' into 'master'
...
Adjusted tiers of various items
See merge request veloren/veloren!4249
2024-01-23 21:58:14 +00:00
JCoxeye
d017844416
Adjusted tiers of various items
2024-01-23 21:58:14 +00:00
JCoxeye
3207df3762
Rebalances, and moved sandals to cloth armor loot table, in line with other starter armor.
2024-01-23 16:46:24 -05:00
Joshua Barretto
92a8bc2806
Merge branch 'zesterer/toggle-light-sprites' into 'master'
...
Added the ability to toggle light sources on and off
See merge request veloren/veloren!4267
2024-01-22 09:39:31 +00:00
Joshua Barretto
4cbec5d93c
Interaction distance check, better text
2024-01-21 21:30:08 +00:00
do-no-van
8c5759cb5e
balance sword abilities
2024-01-21 20:18:19 +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
maxicarlos08
83a24acc1e
Add charm animation
2024-01-21 15:00:06 +01:00
Sam
95835887e1
Charms now have crafting recipes.
2024-01-21 15:00:06 +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
Samuel Keiffer
3224bc5147
Merge branch 'crabman/earthsplitter-nerf' into 'master'
...
earthsplitter nerf
See merge request veloren/veloren!4264
2024-01-20 18:30:55 +00:00
flo
48a79b3e78
haniwa
2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf
2024-01-20 18:32:29 +01: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
juliancoffee
d3fcade857
Rename ItemL10n to ItemI18n
2024-01-16 19:14:14 +02:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
...
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
JCoxeye
941e953348
Merge branch veloren:master into jcoxeye/price-entries
2024-01-15 22:47:06 +00: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
7228543fbf
Mark legacy item asset content
2024-01-14 21:25:15 +02:00
juliancoffee
28b400825e
Add item localization assets
2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6
Enhance /kit all
...
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
anymore
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
Samuel Keiffer
dc215ace34
Merge branch 'juliancoffee/buff-misc-cmd' into 'master'
...
Add /buff_complex command
See merge request veloren/veloren!4243
2024-01-14 17:35:21 +00:00
JCoxeye
be951e747c
Merge branch veloren:master into jcoxeye/price-entries
2024-01-11 14:21:23 +00:00
Hrom
88c5a2e009
renamed twiggy shoulders
2024-01-09 23:54:32 +00: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
JCoxeye
49994af136
Added glacial crystal to unsellable_materials.ron, and buffed price of boreal armor by 5x.
2023-12-27 08:34:27 -05:00
JCoxeye
0f46eeaa78
Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs
2023-12-27 07:59:03 -05:00
JCoxeye
41bec15bc5
Added price entries for blue falcon, moonrise glider, and eerie pumpkin lantern to collection.ron, and added price entries for liana kit and heavy seabag to misc_armor.
2023-12-27 07:59:03 -05:00
JCoxeye
3f747b5ab3
Reverted grim salvager loot table changes, added bandanas and hoods to misc_armor, and roughly adjusted file weighting accordingly.
2023-12-27 07:59:02 -05:00
JCoxeye
3dc2c04491
Reduced price of abyssal heart.
2023-12-27 07:59:02 -05:00
JCoxeye
9334c7a2f9
Added price entries for coral, brinestone, abyssal hearts, and pearls in unsellable_materials.
2023-12-27 07:59:01 -05:00
JCoxeye
a7562b1baf
Added a loot table in assets/common/trading for misc_armor, containing a variety of assorted armor.
2023-12-27 07:59:01 -05:00
JCoxeye
5c90797ee1
Moved grim salvager armor drops to their own loot table, and gave said loot table a price entry.
2023-12-27 07:59:00 -05:00
