Commit Graph

705 Commits

Author SHA1 Message Date
Isse
9903d2c545 more testing 2024-01-30 00:52:49 +01:00
João Capucho
d29d22dd0a update to wgpu 0.18 2024-01-30 00:52:49 +01:00
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00:00
juliancoffee
9264fe77b1 Add veloren-common-i18n
- Move common::comp::chat::Content to its own place
2024-01-14 21:25:15 +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
Imbris
6d57169875 review fixes 2024-01-04 00:01:08 -05: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
Isse
c1aa9bd1b6 move some details to generate 2023-12-07 20:08:03 +01:00
Marcel Märtens
adeab73876 move whole webserver to server-cli 2023-10-18 09:35:40 +02:00
Marcel Märtens
38f4b8b644 There is no way to moderate ChatMessages not send in global chat. For this way we might investigate in a different approach.
The Gameserver returning the latest chat messages via a REST api (protected by a password in settings).
A central service can then scrape this endpoint and make it accessable to moderators.

We need to make sure to log which moderator sees which messages, especially when whispered. to be sure we might also limit the holding period to a week
2023-10-18 09:35:40 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Marcel Märtens
3f7f7195cd use imbris gfx fix 2023-10-06 17:09:19 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
Imbris
9c398cb06d djust for changes in specs safety refactor 2023-09-24 23:46:59 -04:00
Imbris
cd98dd5245 Remove unused deps flagged by cargo-machete 2023-09-21 22:59:50 -04:00
Isse
f4ca60cbb6 Map selector and generation UI 2023-09-17 17:11:19 +00:00
Imbris
b9731b57ce Update to specs 0.19 2023-09-15 16:32:59 -04:00
Imbris
afe97f4d67 Make sure we use one version of tracy-client!!!!! 2023-09-15 16:32:59 -04:00
Marcel Märtens
d67817068e fix auth, needed to set correct Config for argon to fix the hashing 2023-09-13 12:23:36 +02:00
Marcel Märtens
d54ed537ac update uuid via authc 2023-08-28 20:09:17 +02:00
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02:00
Marcel Märtens
96bf6309d2 small updates to dependencies 2023-08-27 19:17:04 +02:00
Marcel Märtens
4ff25d7233 cargo update 2023-08-27 19:17:04 +02:00
Marcel Märtens
3346a3bc1f some manual dependency updates 2023-08-27 19:17:01 +02:00
Imbris
de34726fa7 Merge branch 'imbris/winit-update-v2' into 'master'
Update winit to 0.28

See merge request veloren/veloren!4088
2023-08-27 15:10:00 +00:00
Laura
f0d8237e2d Upgrade authc dependency revision
42dddd666f28e1a94cdf4b542fcd61f67658e261 contains additional fixes
for RUSTSEC-2023-0052.
2023-08-23 11:17:30 +02:00
Imbris
e0ead44b54 Fix windows build 2023-08-23 01:22:17 -04:00
Imbris
eec1b5853e Remove unused cpal version
Also it turns out directories-next is in use for something that we need
2023-08-23 00:47:31 -04:00
Imbris
f5445774de Update winit to 0.28
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
Laura
b03d0dcc7b Upgrade rustls and quinn
According to RUSTSEC-2023-0052 we need to upgrade rustls to 0.21
to get a fix for the issue which may or may not affect Veloren
since it's about client certificates but with the absence of a
PoC it seems like a good idea to upgrade anyway, just to be sure.

webpki has gone unmaintained (which rustls 0.20 depends on),
starting with rustls 0.21 it depends on rustls-webpki which
contains a fix for the issue. Since quinn also depends on
rustls 0.20 in 0.8 and 0.9 versions, we needed to upgrade it to
0.10 so that it depends on rustls 0.21 which we now use.
2023-08-23 06:35:36 +02:00
Marcel
09646a9830 Merge branch 'tibbon1/update_num_derive_0_4_0' into 'master'
num_derive 0.3 -> 0.4.0

See merge request veloren/veloren!4053
2023-08-17 16:42:31 +00:00
David Fisher
a5d597516e num_derive 0.3 -> 0.4.0
because: num_derive was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates num_derive to 0.4.0

Tests appear to pass locally, pending CI run for confirmation.

Changes between 0.3 and 0.4.0:
https://github.com/rust-num/num-derive/compare/num-derive-0.3.0...num-derive-0.4.0
2023-07-31 10:28:36 -04:00
David Fisher
7751ef611c approx 0.4.0 -> 0.5.1
because: approx was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates approx to 0.5.1

Tests appear to pass.

Changes between 0.4.0 and 0.5.1:
https://github.com/brendanzab/approx/compare/v0.4.0...v0.5.1
2023-07-31 08:22:52 -04:00
Marcel Märtens
31da906f84 update mumble-link and remove a old path to migrate pre-2020 voxygen saves to the new save location
With this change people with older version need to run a version from 2021-2022 before updating to this change and start singleplayer once.
Get rid of old rust dependencies
2023-07-17 10:50:53 +02:00
Christof Petig
43f7bb7ddc implement the first half of zesterer's proposals and update wasmer 2023-07-01 15:31:53 +02:00
Christof Petig
28c3721ecf upgrade wasmer, implement basic WASI, turn off login events for now 2023-07-01 15:31:53 +02:00
Marcel Märtens
e3f8046691 Change the version number to 0.15 2023-06-30 16:31:00 +02:00
Imbris
5af9761d84 Update fd-lock, parking_lot, and parking_lot_core 2023-05-10 12:43:51 -04:00
Imbris
d87ed2937b Update tokio 2023-05-10 12:43:50 -04:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
maxicarlos08
5c4c47b517
Use LRU cache for caching presistent chunks instead of time-based cache 2023-05-09 20:06:53 +02:00
Marcel Märtens
9dc550daea fix windows compilation 2023-05-08 18:58:54 +02:00
Imbris
95a38ff8f6 Merge branch 'imbris/revert-some' into 'master'
Revert some of the updates to make windows cross compile directx work

See merge request veloren/veloren!3918
2023-05-06 05:12:20 +00:00
Imbris
af0d0f3ea4 Second attempt (success) 2023-05-06 00:30:54 -04:00
Imbris
1a7e38e48b First attempt (no success) 2023-05-06 00:30:41 -04:00
Marcel Märtens
cd7d889c13 get rid of oldtime in chrono 2023-05-05 18:25:49 +02:00
Marcel Märtens
d90ea8c1da get rid of structop and update clippy in common test, now only criterion is left with version 2 2023-05-05 09:46:46 +02:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Marcel Märtens
27620e665b we need a new version of refinery that needs a new version of rusqlite, so update both 2023-05-04 20:53:00 +02:00
Marcel Märtens
054f4f9453 update veloren deps 2023-05-04 11:58:43 +02:00
DaforLynx
7bf6df5ec1 Small music update 2023-04-29 05:34:28 +00:00
Marcel Märtens
f58feb0c23 update deps which no longer work in the future of rust 2023-04-27 21:11:45 +02:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Imbris
f525be9b3b Update tracy-client to 0.15.2, also use tracy_client through the
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
2023-04-18 21:28:15 -04:00
Joshua Barretto
3582d86c70 Simplified localisation logic 2023-04-11 23:51:07 +01:00
Joshua Barretto
edcc2f1870 Overhauled chat message representation to allow for more exhaustive localisation 2023-04-11 15:46:36 +01:00
Joshua Barretto
b50645c1ee Addressed review comments 2023-04-10 17:59:43 +01:00
Joshua Barretto
b2627e2690 Use cheap RNG in NPC AI code 2023-04-09 19:25:57 +01:00
Joshua Barretto
364255c7fe Allowed rtsim NPCs to greet nearby actors 2023-04-09 19:25:55 +01:00
Isse
1c0fdf9228 rtsim personalities 2023-04-09 19:25:55 +01:00
Joshua Barretto
c4032ee024 Parallelised rtsim NPC AI 2023-04-09 19:25:54 +01:00
IsseW
9be6c7b527 Pathing between sites. 2023-04-09 19:25:53 +01:00
IsseW
afd9ea5462 site pathing 2023-04-09 19:25:52 +01:00
Joshua Barretto
87a6143375 Began adding rtsim2 NPCs, scale command 2023-04-09 19:25:51 +01:00
Joshua Barretto
9d3dadfaba Make resource depletion an rtsim rule 2023-04-09 19:25:51 +01:00
Joshua Barretto
0b06eaec6f Use MessagePack for more compact rtsim state persistence 2023-04-09 19:25:51 +01:00
Joshua Barretto
c168ff2f9b Added rtsim saving, chunk resources, chunk resource depletion 2023-04-09 19:25:51 +01:00
Joshua Barretto
0cafafdaa7 Began integrating rtsim2 into server 2023-04-09 19:25:51 +01:00
Joshua Barretto
ca80d831ce Added rtsim crate, added initial persistence model 2023-04-09 19:25:51 +01:00
Christof Petig
7ab2bcd4e4 revert unwanted regressions as indicated by imbris 2023-04-06 08:30:49 +02:00
Christof Petig
8fac5192cc update wasmer 2023-04-05 22:19:28 +02:00
Imbris
9dd1b6c785 Switch from ansi-parser to cansi, down to a single version of nom! 2023-04-05 02:38:58 -04:00
Imbris
6ed75fa3aa Update tynm dependency (had to update nom first) 2023-04-04 22:25:32 -04:00
Imbris
8352e4efae Update copypasta version used by conrod so that we can avoid dependence on old xcb that will fail to compile soon due to dependency on quick-xml 0.22.0
See https://gitlab.com/veloren/veloren/-/issues/1815
2023-04-04 18:07:09 -04:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Imbris
e8a5de4e65 Switch from custom macro for grouping cfgs to cfg_if since rustfmt can't see through macros but is hardcoded to parse cfg_if and follow the module names inside it. 2023-03-11 08:06:46 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01:00
Avi Weinstock
a871d3880b Address MR 3756 review comments. 2023-01-19 15:06:13 -05:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
Sam
7d42c45fdd Site2 code is now hot-reloadable with 'hot-site2' feature. 2023-01-09 20:06:35 -05:00
Marcel Märtens
25906e05df Change the version number to 0.14 2023-01-06 18:41:03 +01:00
Marcel Märtens
0c10b8ca08 fix Cargo.lock and fmt 2023-01-02 15:06:42 +01:00
Blinc
57b2f3c11c Wayland permission fix - update keyboard-keynames 2022-12-31 17:08:32 +03:00
Aidar Shaikhiev
cccc796d31 Items images export for wiki 2022-12-15 16:19:49 +00:00
Marcel
b328377979 Merge branch 'assets_manager-0.9' into 'master'
Update to `assets_manager 0.9

See merge request veloren/veloren!3723
2022-12-15 11:34:46 +00:00
James Gayfer
0badaaa4ba Fix Xbox controller mappings on MacOS
After downloading the game onto my M1 Macbook, I wasn't able to get my
Xbox Series X controller to work properly. The mappings seems all over
the place in ways that didn't make sense, like the right analog stick
bound to primary and secondary attack.

I looked deeper into how controller binds work, and saw that they're
mostly all mapped to sane defaults via gilrs. I setup a test project
that mirrored gilrs's "hello world" example for controller inputs, and
noted that the inputs were logged as expected. This is when I noted the
version mismatch, as Veleron was using 0.9, while my project was using
0.10. After rolling back to 0.9 in my test project, I was able to
reproduce the incorrect mappings.

With the bump to 0.10, controller mappings respect our configured
defaults for my Xbox Series X controller on MacOS.
2022-12-13 21:42:32 -08:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
Sam
c09e858cba Single target melee attacks now hit the closest target instead of a random target. 2022-10-27 20:06:28 -04:00
Joshua Barretto
3c54e63592 Various minor optimisations 2022-10-12 13:57:14 +01:00
Marcel Märtens
81cdcfc1a0 move voxygen/i18n to client/i18n to indicate that it can be used by more frontends if they want to make use of our helpers 2022-09-27 14:09:20 +02:00
Marcel Märtens
7f46bc5b78 switch name to i18n-helpers 2022-09-27 13:46:13 +02:00
Marcel Märtens
cc3fcfce8c initial approach of utelising chat-i18n crate by chat-cli bot 2022-09-27 13:46:12 +02:00
Marcel
17c940e0f8 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `2022-09-23`

See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f remove enum_iterator with strum, fixes #1723 2022-09-25 16:09:46 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
2022-09-24 00:04:40 +02:00
Marcel Märtens
049deeca52 cargo update without any windows_gnu msvs crates 2022-09-22 19:17:54 +02:00
Marcel Märtens
fc352a59a0 update forbidden crates 2022-09-22 17:47:07 +02:00