Commit Graph

15215 Commits

Author SHA1 Message Date
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
Sam
26b1561bca Changed to using a separte pseudo container in the database for overflow items 2024-02-02 20:07:01 -05:00
Sam
ccb997cc96 Added check for multiple items being stored with the same overflow position. 2024-02-02 20:07:00 -05:00
Sam
394e798d04 Addressed review comments 2024-02-02 20:07:00 -05:00
Sam
b87d1b649d Overflwo slots now appear as red in the inventory. 2024-02-02 20:06:59 -05: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
Illia Denysenko
2c9ceb51d5 Merge branch 'woeful/shoulder_aiming_camera' into 'master'
Third person over-the-shoulder camera and look_dir calculations when aiming

See merge request veloren/veloren!4285
2024-02-02 16:59:13 +00: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
63394719a1 Make camera offsets and aiming system only apply when wielding ranged 2024-02-01 23:33:05 +02:00
Woeful_Wolf
1c69614b4e Cleanup and comments 2024-02-01 23:32:24 +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
Woeful_Wolf
b9239cf603 Merge branch 'woeful/shoulder_aiming_camera' of https://gitlab.com/veloren/dev/veloren into woeful/shoulder_aiming_camera 2024-02-01 20:38:15 +02:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Woeful_Wolf
f4aa9ecbe3 code-quality edits 2024-02-01 20:36:33 +02:00
Woeful_Wolf
5b00d41cd4 Cleaned up some extra imports and debug code 2024-02-01 20:36:32 +02:00
Woeful_Wolf
1660d703ac Changed how look_dir is calculated when aiming, now ray casts entities and terrain to find target point 2024-02-01 20:36:32 +02:00
Woeful_Wolf
e270992bda Added x and y aiming offsets to settings 2024-02-01 20:36:31 +02:00
Woeful_Wolf
43566bca32 Added x and y camera offsets when aiming in third person 2024-02-01 20:36:30 +02:00
Woeful_Wolf
c78f6c0bc2 Added basic ray_entities and closest_line_seg_line_seg methods 2024-02-01 20:36:29 +02:00
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master'
Update wgpu

See merge request veloren/veloren!4245
2024-02-01 12:14:32 +00:00
Marcel Märtens
94df06ca19 remove outdated comment and make use of more constants 2024-02-01 12:17:19 +01:00
Marcel Märtens
dfb8715aed make map_async function slim and handle the other stuff inside the download_and_handle_internal fn which is only called from a seperate thread 2024-02-01 12:05:11 +01:00
Marcel Märtens
db9eca031c use constants in dummy_scene 2024-02-01 12:05:11 +01:00