Marcel Märtens
b0bef3ebbf
update few dependencies
2024-02-06 19:11:10 +01:00
Marcel
9af1c4c310
Merge branch 'xMAC94x/update' into 'master'
...
run cargo update
See merge request veloren/veloren!4308
2024-02-06 18:08:26 +00:00
juliancoffee
bfff41dc97
Rever alignment and group manipulation
2024-02-06 15:58:40 +02:00
juliancoffee
dab058740b
Give /dropall to mods again
2024-02-06 15:43:46 +02:00
juliancoffee
d6a17366f1
fmt
2024-02-06 15:43:46 +02:00
juliancoffee
33f0c55510
Restrict permission requirements
...
- Fix typo when /alignment was available to Moderator
- Remove non-moderation commands from Moderator
2024-02-06 15:43:45 +02:00
juliancoffee
7e2f219de1
Rename /be_npc to /into_npc
2024-02-06 15:43:45 +02:00
juliancoffee
70b5c2927d
Add /alignment command
2024-02-06 15:43:45 +02:00
juliancoffee
8889407660
Add /be_npc command
2024-02-06 15:43:45 +02:00
Marcel Märtens
c69224171b
run cargo update
2024-02-06 12:45:32 +01:00
Marcel Märtens
6ebbb89d4d
update toolchain to nightly-2024-01-17
2024-02-05 19:51:50 +01: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
juliancoffee
e5c2ee6b23
Improve translator documentation and wording
2024-02-04 00:11:49 +02:00
juliancoffee
7bb2d11c98
Add documentation for localize_npc methods
2024-02-03 23:57:52 +02:00
juliancoffee
5aa88ac223
Store the gender in CharacterInfo
2024-02-03 18:58:46 +02:00
juliancoffee
aecdadca14
Improving documentation
2024-02-03 18:58:46 +02:00
juliancoffee
eeb7cab8c3
Implement gender, kind of
2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448
Remove/Deprecate KillSource::Environment
2024-02-03 18:58:46 +02:00
juliancoffee
af396aa8dd
Add Gender marker for body
...
- Add gender() method on body, which is derived from body_type
- Expose it in ChatContext so that chat i18n can use it.
2024-02-03 18:58:45 +02:00
Sam
e925664d36
Addressed review comments
2024-02-02 20:06:59 -05:00
Sam
8d1df956d6
Addressed review comments
2024-02-02 20:06:58 -05:00
Sam
632e922db6
Overflow slots displayed in bag
2024-02-02 20:06:58 -05:00
Sam
d01997ca56
Overflow slots as slots
2024-02-02 20:06:55 -05:00
Sam
93ca630a13
Automatically overflows items to 'overflow slots' that are inaccessible if items cannot be inserted in persistence on character load.
2024-02-02 20:06:05 -05:00
Woeful_Wolf
7b843444be
Renamed closest_points_ls3 to closest_points_3d, added comments, disable raycast aiming in FPV, get shortest between entity and terrain raycast
2024-02-02 18:11:37 +02:00
Woeful_Wolf
c86f000881
Moved closest_line_seg_line_seg to common/systems/src/phys.rs and renamed to closest_points_ls3
2024-02-01 22:34:42 +02:00
Treeco
7496aa5357
Added LOD objects for new forest types
2024-01-31 23:01:44 +00:00
BigKhan
554e5b6c80
Added Autumn ForestKind
2024-01-31 16:50:13 +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
Christof Petig
80dd3946be
Provide the same API when plugins are disabled
2024-01-30 23:52:41 +01:00
Christof Petig
eaba303670
Merge branch 'christof/hot-reload-fix' into 'master'
...
Fix hot reloading for plugin combined manifests
See merge request veloren/veloren!4280
2024-01-28 20:02:02 +00:00
BigKhan
69f549deab
made the trees maples instead. renamed the ForestKind to match.
2024-01-28 14:34:11 +00:00
BigKhan
f626fdc496
Added Autumn Trees
2024-01-27 21:12:51 +00:00
Christof Petig
ed7fd13a50
fix unit tests
2024-01-27 21:24:24 +01:00
maxicarlos08
d11c58b75b
Merge branch 'synis/item-tabcomplete' into 'master'
...
Incremental item path autocomplete
See merge request veloren/veloren!4281
2024-01-27 18:03:21 +00:00
Isse
2023786f5e
Merge branch 'isse/optimize-weather' into 'master'
...
Optimize weather
See merge request veloren/veloren!4270
2024-01-27 17:20:53 +00:00
Syniis
488922ac94
Cleaner code
2024-01-27 16:16:30 +01:00
Syniis
b97e27df9a
Allow specifiying prefix for AssetPath command argument
2024-01-27 15:44:03 +01:00
Christof Petig
b407a2b186
Fix the obvious problems, still recipe book isn't hot reloading any more
2024-01-27 15:19:37 +01:00
Syniis
d46dbb9708
Incremental item path autocomplete
2024-01-27 13:41:39 +01:00
Christof Petig
cc93474c2f
fix hot reloading of combined manifests
2024-01-27 12:40:34 +01:00
Christof Petig
bab8c713fb
simplify cache handling
2024-01-27 12:40:25 +01:00
Maxicarlos08
76627cd544
only use hash cache, fix compression benchmark, fixed be/le bug
2024-01-26 17:48:37 +01:00
Maxicarlos08
c5ddf73dc2
optimize sprites in compressed chunks
2024-01-26 16:26:26 +01:00
Maxicarlos08
e2c2e1bce1
store sprite data separately for compressed chunks
2024-01-26 11:16:06 +01:00
Imbris
fd2e45cfde
Merge branch 'crabman/terrain-persistence-crash' into 'master'
...
don't remove blocks when applying changes for new chunks
See merge request veloren/veloren!4276
2024-01-26 02:08:59 +00:00
Maxicarlos08
47a909e94d
fix the *actual* crash
2024-01-26 02:31:21 +01:00
Maxicarlos08
4276dbd628
updated bed sprite height
2024-01-25 19:40:58 +01:00
Isse
ef59e57347
round to nearest integer for compressed weather
2024-01-25 00:35:14 +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
Isse
8f15dedc3b
fix weather_zone command, and only send local wind once every 30 ticks
2024-01-23 22:21:33 +01:00
Isse
b55038a526
rename SharedWeather to CompressedWeather
2024-01-23 21:05:57 +01:00
Isse
268215b301
make weather not block main thread, and lessen the amount of data shared with client.
2024-01-22 19:53:36 +01: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
49ba880af0
Removed irrelevant test
2024-01-21 22:14:40 +00:00
Joshua Barretto
d836461f8d
Use SpriteInteract state for toggling lights
2024-01-21 21:30:08 +00:00
Joshua Barretto
4a89d88e9b
Added default sprite attribute state
2024-01-21 21:30:08 +00:00
Joshua Barretto
ad8965fdd7
Don't use distinct event system for handling sprite interactions
2024-01-21 21:30:08 +00: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
do-no-van
646c57501f
make fortitude scale of difference from maximum health
2024-01-21 20:18:19 +00:00
do-no-van
8c5759cb5e
balance sword abilities
2024-01-21 20:18:19 +00:00
maxicarlos08
83a24acc1e
Add charm animation
2024-01-21 15:00:06 +01: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
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
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
d30fed3961
earthsplitter nerf
2024-01-20 18:32:29 +01:00
Benoît du Garreau
b6ffb3a146
Update assets_manager to v0.11
2024-01-20 15:46:16 +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
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
JCoxeye
941e953348
Merge branch veloren:master into jcoxeye/price-entries
2024-01-15 22:47:06 +00:00
Joshua Barretto
5bc60f2436
Add LoD zone data to char select screen
2024-01-15 19:07:19 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +01:00
Joshua Barretto
3d9ab445d9
Added rules field to server description
2024-01-15 00:02:42 +01:00
juliancoffee
d743293e56
clippy & fmt
2024-01-14 21:25:15 +02:00
juliancoffee
1748b5e76f
Final(?) step to deprecating item names
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
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
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
juliancoffee
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
juliancoffee
75013cc04a
Make sfx.ron use ItemKey
2024-01-14 21:25:15 +02:00
juliancoffee
9264fe77b1
Add veloren-common-i18n
...
- Move common::comp::chat::Content to its own place
2024-01-14 21:25:15 +02:00
Samuel Keiffer
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
Maxicarlos08
3a7bb698fc
handle overlap and queueing correctly
2024-01-13 19:53:02 +01:00
Maxicarlos08
da08376e9a
Don't stack buffs of the same kind with equal attributes
2024-01-13 18:58:44 +01:00
JCoxeye
be951e747c
Merge branch veloren:master into jcoxeye/price-entries
2024-01-11 14:21:23 +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
juliancoffee
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
juliancoffee
f4939220cc
Add BuffKind::differentiate
2024-01-08 20:13:17 +02:00
juliancoffee
5514df330b
Add BuffDescriptor enum
2024-01-08 20:13:17 +02:00
