Commit Graph

15012 Commits

Author SHA1 Message Date
ab8a7147b4 Add test that checks that all items have en i18n 2024-01-16 23:07:36 +02:00
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
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
64debe2f0b Remove unnecessary conversion 2024-01-16 17:47:24 +00:00
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
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
25c7169991 Renamed share_with_server -> send_to_server
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
db569513f3 review 2024-01-16 13:07:53 +02:00
751df7801f Render airship sprites in char select 2024-01-15 22:51:54 +00:00
941e953348 Merge branch veloren:master into jcoxeye/price-entries 2024-01-15 22:47:06 +00:00
d51b5c5bea Add airship to char select 2024-01-15 22:35:42 +00:00
3420e7a227 Appease clippy 2024-01-15 19:07:19 +00:00
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00:00
5d4133eea5 Updated changelog 2024-01-15 19:07:15 +00:00
43d935a150 Render render LoD terrain on char select, remove old backdrop figure 2024-01-15 19:06:17 +00:00
d814296676 review fixes 2024-01-15 17:55:16 +01:00
56cc33ec55 fix pipeline 2024-01-15 00:03:23 +01:00
d6371f7f9b Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
e4dbe50f39 Tick client when in server info menu 2024-01-15 00:03:23 +01:00
f991a5677f Updated changelog 2024-01-15 00:03:22 +01:00
f99bf91617 Added rules menu when connecting to server 2024-01-15 00:02:43 +01:00
3d9ab445d9 Added rules field to server description 2024-01-15 00:02:42 +01:00
05ca01ce89 Merge branch 'walpo/remove-twitter-refs' into 'master'
Remove Twitter account references on the documentation

Closes #1900

See merge request veloren/veloren!4187
2024-01-14 20:06:22 +00:00
7228543fbf Mark legacy item asset content 2024-01-14 21:25:15 +02:00
28b400825e Add item localization assets 2024-01-14 21:25:15 +02:00
d743293e56 clippy & fmt 2024-01-14 21:25:15 +02:00
1748b5e76f Final(?) step to deprecating item names 2024-01-14 21:25:15 +02:00
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
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
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
8263154a7e Discourage random i18n and prettify get_content
- Add the comment that recommends avoiding all `get_variation` methods.
- Add the comment that recommends avoiding Content with random i18n.
- Improve `get_content` docs.
2024-01-14 21:25:15 +02:00
1347a31108 Deprecation step of Item::name/description
- Mark Item::name() and Item::description() deprecated, along with
  corresponding ItemDesc methods.
- Dummify dialogue code that uses items, as it's not used anyway. In the
  future it should use common_i18n::Content.
- Allow usage of deprecated .name() for Inventory ordering, for now.
- Allow usage of deprecated .name() for Inventory ordering for
  merchants, for now.
2024-01-14 21:25:15 +02:00
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
9264fe77b1 Add veloren-common-i18n
- Move common::comp::chat::Content to its own place
2024-01-14 21:25:15 +02:00
b4ae34cd7c Merge branch 'crabman/unstack-buffs' into 'master'
Don't stack buffs of the same kind with equal attributes

See merge request veloren/veloren!4251
2024-01-14 17:54:16 +00:00
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
3a7bb698fc handle overlap and queueing correctly 2024-01-13 19:53:02 +01:00
df7c2ee70a changelog 2024-01-13 18:58:50 +01:00
da08376e9a Don't stack buffs of the same kind with equal attributes 2024-01-13 18:58:44 +01:00
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00:00
flo
3922d28c8b Merge branch 'hrom/twig-shoulder-fix' into 'master'
renamed twiggy shoulders

See merge request veloren/veloren!4242
2024-01-09 23:54:32 +00:00
88c5a2e009 renamed twiggy shoulders 2024-01-09 23:54:32 +00:00
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
2746a98f40 Add /buff_complex command 2024-01-08 20:13:17 +02:00
5aa30b0175 Warn about complex buffs when using /buff 2024-01-08 20:13:17 +02:00
18742bc7fb Fix veloren-server compilation
As veloren-server enables plugin feature automatically, it results in
veloren-common-state inherit this feature, which enables
common/state/plugin/mod.rs which asks for common::assets function that
is enabled only if plugin feature is enabled, but because
veloren-common-state doesn't depend on common::assets, this feature is
kind of lost half-way.

This commit fixes this by adding explicit optional dependency on
common-assets in common-state that is enabled by plugin feature.
2024-01-08 20:13:17 +02:00
f4939220cc Add BuffKind::differentiate 2024-01-08 20:13:17 +02:00
5514df330b Add BuffDescriptor enum 2024-01-08 20:13:17 +02:00
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
95f63e46e6 update Ukrainian translation 2024-01-08 16:39:08 +00:00