Commit Graph

5396 Commits

Author SHA1 Message Date
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
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
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
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
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +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
e4dbe50f39
Tick client when in server info menu 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
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
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
Imbris
03e46de748 Merge branch 'imbris/construct-dispatcher-once' into 'master'
Only construct specs::Dispatcher once

See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
6c6b9181a5 Only construct specs::Dispatcher once
* use version of shred that has an added SendDispatcher so we can
  construct the dispatcher and send it between threads (only State to
  remain sendable)
* move closure for adding systems from State::tick to the creation
  functions
* this does mean some voxygen systems always run instead of just in the
  session state, but that should not cause issues and we can always
  configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Imbris
fc28629148 Convert to rgb earlier in screenshot process.
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00
Imbris
35fc92f872 Merge branch 'screenshot' into 'master'
Don't include an alpha channel when creating a screenshot file.

See merge request veloren/veloren!4222
2024-01-01 21:41:41 +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
Sam
8ee054a462 Fix tests 2023-12-29 11:50:18 -05: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
flo
c123bdaef5 various_small_fixes 2023-12-27 07:30:22 +00:00
Darren Salt
4156dd56f3 Don't include an alpha channel when creating a screenshot file. 2023-12-21 17:14:07 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master'
Christmas theme revival

See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
dd8850770e remove variation debugging output 2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279 PRNG experiments 2023-12-15 17:27:15 +01: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
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Joshua Barretto
fbd72f7400 Better walking animation 2023-12-07 20:08:40 +01:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
2097a499c7 cancel walking on some inputs 2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
eb2395a401 walk fixes 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