Commit Graph

1779 Commits

Author SHA1 Message Date
Sam
d01997ca56 Overflow slots as slots 2024-02-02 20:06:55 -05:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Woeful_Wolf
e270992bda Added x and y aiming offsets to settings 2024-02-01 20:36:31 +02:00
Isse
89d70cc932 cache present modes, add check for present modes in set_render_mode and move present mode localization to hud 2024-02-01 12:05:11 +01:00
Isse
b7a56e895a Only show available present modes in graphic settings 2024-02-01 12:05:06 +01:00
João Capucho
d29d22dd0a update to wgpu 0.18 2024-01-30 00:52:49 +01:00
Christof Petig
cc93474c2f fix hot reloading of combined manifests 2024-01-27 12:40:34 +01:00
Tim Vincent
2ac2f2d45e stops centering the cursor to prevent camera jumping when the cursor grab is released 2024-01-23 20:09:23 -08:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
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
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
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
Woeful_Wolf
3cb5132ab9 Simplified match, use filter and cargo fmt suggestions 2024-01-20 20:40:16 +02:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Woeful_Wolf
25e4e09ab4 Fixes #1923 - Pickaxe tooltip wrong for digging 2024-01-20 19:08:41 +02: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
juliancoffee
db569513f3 review 2024-01-16 13:07:53 +02:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
juliancoffee
1748b5e76f Final(?) step to deprecating item names 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
18e507315f Add ItemDesc::l10n method
- Add ItemL10n struct that is similar to ItemImgs except it holds i18n
  description and not items. ItemDesc::l10n uses this struct to provide
  common_i18n::Content for both names and descriptions.
  So far it only used in voxygen, but it can be used by rtsim in
  dialogues.
- Introduced new deprecation, ItemKind::Ingredient, because it uses
  item.name().
  It's not deleted, because it's used in inventory sorting, and our
  inventory sorting is, for some reason, server-side.
- Crafting UI also still uses deprecated item.name(), because again,
  sorting. It's probably will be easier to handle, because it's UI
  sorting and we can use localized names here, but still, it's a thing
  to discuss.
- Moved Item::describe() to voxygen/hud/util.

The most important thing to note is we don't want to completely delete
deprecated .name() and .description() along with corresponding fields
in ItemDef because ItemDef is now "public" API, exposed in plugins and I
don't want to break plugins before we actually implement i18n for them.
Otherwise, it would be basically impossible to use items in plugins.

What's left is actually fully implementing ItemDesc::l10n, create
item_l10n.ron and add fallback on current .name() and .description()
implementation.
2024-01-14 21:25:15 +02:00
Darren Salt
140f7a0871 Allow either Enter or Return for sending a message. 2024-01-08 11:10:32 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Isse
ba02d083da Merge branch 'isse/walk-toggle' into 'master'
Roleplay stuff

See merge request veloren/veloren!4171
2023-12-12 19:59:58 +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
Hrom
de42ffdfd8 fixed perforate icon not displaying 2023-12-06 23:38:22 +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
Py bit
53600a941d Update mod.rs 2023-11-29 17:03:17 +00:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -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
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
Maxicarlos08
c689708ec9
fix stat UI bug while trading 2023-11-26 20:22:59 +01:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Joshua Barretto
9dd5cd24d1 Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons 2023-10-13 11:57:49 +01:00
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00