Samuel Keiffer
9998dbd587
Merge branch 'sam/expose-charms' into 'master'
...
Charms now have crafting recipes.
See merge request veloren/veloren!4179
2024-01-21 17:39:37 +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
Isse
0755f339a2
Merge branch 'woeful/1923-wrong-digging-tooltip' into 'master'
...
Fixes #1923 - Pickaxe tooltip wrong for digging
Closes #1923
See merge request veloren/veloren!4263
2024-01-21 14:21:46 +00: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
Illia Denysenko
727d32c104
Merge branch 'master' into 'master'
...
Prevent time until next battlemode change from being displayed as negative
See merge request veloren/veloren!4205
2024-01-21 13:35:09 +00:00
Keegan-JW
77d6492dbf
Prevent time until next battlemode change from being displayed as negative
2024-01-21 13:35:09 +00:00
Marcel
7ecf0487f1
Merge branch 'chat-bits' into 'master'
...
Allow either Enter or Return for sending a message.
See merge request veloren/veloren!4247
2024-01-21 10:46:53 +00:00
Illia Denysenko
cebfb9f508
Merge branch 'timvinc/kill_npc_cmd_option' into 'master'
...
Fixes #1922 - Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets'
Closes #1922
See merge request veloren/veloren!4261
2024-01-21 10:27:09 +00: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
Tim Vincent
cb1a0b9f91
Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets'
2024-01-20 16:39:42 -08:00
Samuel Keiffer
f8428eda85
Merge branch 'fix_adlet_elder_sword' into 'master'
...
fix_adlet_elder_sword
See merge request veloren/veloren!4265
2024-01-20 22:06:56 +00:00
flo666
a849286563
fix_adlet_elder_sword
2024-01-20 21:07:38 +01:00
Woeful_Wolf
3cb5132ab9
Simplified match, use filter and cargo fmt suggestions
2024-01-20 20:40:16 +02: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
Samuel Keiffer
5d6824aace
Merge branch 'haniwa' into 'master'
...
haniwa
See merge request veloren/veloren!4234
2024-01-20 17:45:23 +00:00
flo
48a79b3e78
haniwa
2024-01-20 17:45:23 +00:00
Maxicarlos08
de5df01c1b
changelog
2024-01-20 18:33:16 +01:00
Maxicarlos08
d30fed3961
earthsplitter nerf
2024-01-20 18:32:29 +01:00
Woeful_Wolf
25e4e09ab4
Fixes #1923 - Pickaxe tooltip wrong for digging
2024-01-20 19:08:41 +02:00
Illia Denysenko
dba8c94030
Merge branch 'alphyr/assets_manager_v0.11' into 'master'
...
Update `assets_manager` to v0.11
See merge request veloren/veloren!4248
2024-01-20 15:46:16 +00:00
Benoît du Garreau
b6ffb3a146
Update assets_manager to v0.11
2024-01-20 15:46:16 +00:00
Joshua Barretto
88a4d0898f
Merge branch 'making-things-sprite' into 'master'
...
Overhauled sprite representation to support many more sprites and attributes
See merge request veloren/veloren!4259
2024-01-20 11:16:18 +00:00
Joshua Barretto
777d03b361
Categorised more sprites
2024-01-20 10:36:34 +00:00
Joshua Barretto
e5aa8cd3b7
Fix warnings
2024-01-19 20:14:32 +00:00
Joshua Barretto
5260c82c4a
Overhauled sprite representation to support many more sprites and attributes
2024-01-19 18:05:56 +00:00
Marcel
33126c8771
Merge branch 'crabman/rules-panic-fix' into 'master'
...
Fix panic when pressing rule button in character screen
See merge request veloren/veloren!4258
2024-01-19 16:22:37 +00:00
Maxicarlos08
e9d61c2d34
fix rule button panic
2024-01-19 16:44:43 +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
Isse
d0f966160c
Merge branch 'weblate-translation' into 'master'
...
Translated using Weblate (Russian)
See merge request veloren/veloren!4114
2024-01-18 18:00:48 +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
b1c7c2946f
Merge branch 'juliancoffee/item-i18n-followup' into 'master'
...
Add test that checks that all items have en i18n
See merge request veloren/veloren!4255
2024-01-16 22:36:18 +00:00
juliancoffee
ab8a7147b4
Add test that checks that all items have en i18n
2024-01-16 23:07:36 +02: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
Joshua Barretto
64debe2f0b
Remove unnecessary conversion
2024-01-16 17:47:24 +00:00
Joshua Barretto
2a13fe3228
Merge branch 'zesterer/server-rules' into 'master'
...
Added an optional rules screen that requires accepting
See merge request veloren/veloren!4253
2024-01-16 17:14:57 +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
juliancoffee
db569513f3
review
2024-01-16 13:07:53 +02:00
Joshua Barretto
751df7801f
Render airship sprites in char select
2024-01-15 22:51:54 +00: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
3420e7a227
Appease clippy
2024-01-15 19:07:19 +00:00
