Commit Graph

15341 Commits

Author SHA1 Message Date
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
Illia Denysenko
fea7ed1d63 Merge branch 'juliancoffee/be_npc' into 'master'
/be_npc && /alignment commands

See merge request veloren/veloren!4300
2024-02-06 17:46:36 +00:00
juliancoffee
bfff41dc97 Rever alignment and group manipulation 2024-02-06 15:58:40 +02:00
Illia Denysenko
425684908b Merge branch 'juliancoffee/fix-chat' into 'master'
Fix /tell messages

See merge request veloren/veloren!4309
2024-02-06 13:45:53 +00:00
juliancoffee
4067cd783a Clean up presence/persistence logic for /into_npc 2024-02-06 15:43:46 +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
0caa54bf5b Convert into Possessor for /into_npc 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
Illia Denysenko
9b6c678473 Merge branch 'master' into 'master'
Add hints on how to use animal materials to craft weapons

See merge request veloren/veloren!4306
2024-02-06 13:02:48 +00:00
juliancoffee
895d0e604e Fix /tell messages 2024-02-06 14:44:52 +02:00
Marcel Märtens
c69224171b run cargo update 2024-02-06 12:45:32 +01:00
Marcel
56f8587ce1 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `nightly-2024-01-17`

See merge request veloren/veloren!4257
2024-02-06 09:48:04 +00:00
Marcel Märtens
7c998823e2 update tag 2024-02-06 10:05:27 +01:00
Illia Denysenko
7f83b432c9 Merge branch 'juliancoffee/itemtooltip-fix' into 'master'
Widen Item Tooltip

Closes #1925

See merge request veloren/veloren!4305
2024-02-05 19:43:35 +00:00
Marcel Märtens
6ebbb89d4d update toolchain to nightly-2024-01-17 2024-02-05 19:51:50 +01:00
Illia Denysenko
6743386c4e Merge branch 'weblate-translation' into 'master'
Translated using Weblate

See merge request veloren/veloren!4279
2024-02-05 13:59:08 +00:00
Illia Denysenko
330e5ee3b0 Translated using Weblate 2024-02-05 13:59:08 +00:00
Scott Bronson
86ce5960a7 Add hints on how to use animal materials to craft weapons 2024-02-04 17:54:00 -08:00
juliancoffee
c8fa6f8b74 Widen Item Tooltip 2024-02-05 00:40:27 +02: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
30717f46af Remove tracing::error! to avoid log-spam
This error shouldn't be possible to trigger, unless you're playing as
spectator in which case you don't have a character, so we can't pick
right gender.
This should be fixed when we do add UI to pick the gender.
2024-02-04 18:45:07 +02:00
juliancoffee
7b5d9e1eac More direct comments 2024-02-04 18:37:15 +02:00
Illia Denysenko
c645031c3f Merge branch 'juliancoffee/articled-bodies' into 'master'
Improve translator documentation and wording

See merge request veloren/veloren!4303
2024-02-04 16:34:36 +00:00
Marcel
46da8a0d05 Merge branch 'fvasco-aim_offset' into 'master'
Italian translation

See merge request veloren/veloren!4304
2024-02-04 14:30:14 +00:00
Francesco Vasco
7870548746 Italian translation 2024-02-04 14:12:02 +01:00
juliancoffee
ffa031d1bd Specify context of messages 2024-02-04 00:21:21 +02: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
0d69a258b1 Address review 2024-02-03 22:19:03 +02:00
juliancoffee
913cc169d8 Refactor buff handling in kill message match expr 2024-02-03 19:56:17 +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
273ac621a9 (i18n) Ukrainian translation for chat uses genders 2024-02-03 18:58:46 +02:00
juliancoffee
450de681e4 Refactor chat message i18n
- All message types now use i18n to declare format, similar to /tell
- hud-chat-you is removed for now, along with its usage in
  insert_alias()
2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
juliancoffee
13011606d9 Reorganize hud/chat i18n file 2024-02-03 18:58:46 +02:00
juliancoffee
f7b8e079b4 Expose player gender to existing chat messages
TODO: localize /tell and expose gender in 'hud-chat-you'
2024-02-03 18:58:46 +02:00
juliancoffee
490a8d8776 Only insert gender to chat_context for players 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
Imbris
3ebf17370c Merge branch 'timvinc/1930-remove-cursor-centering' into 'master'
Fixes 1930: grabs cursor instead of centering

See merge request veloren/veloren!4273
2024-02-03 16:57:48 +00:00
Illia Denysenko
e36119edc4 Merge branch 'Translation-zh-Hans' into 'master'
Translation:add some new translations for menu and hud

See merge request veloren/veloren!4299
2024-02-03 13:41:13 +00:00
Animoe
dfa184657c Translation:add some new translations for menu and hud 2024-02-03 13:41:13 +00:00
Tim Vincent
87ff55e938 resets the cursor position instead of centering it when grabbed 2024-02-02 21:46:37 -08:00
Samuel Keiffer
aef9d27f64 Merge branch 'sam/inventory-overflow' into 'master'
Inventory Overflow Slots for Persistence

See merge request veloren/veloren!4021
2024-02-03 02:15:11 +00:00
Sam
d4e2095d40 Fix character creation error 2024-02-02 20:07:01 -05:00