Commit Graph

349 Commits

Author SHA1 Message Date
Marcel Märtens
856c64c9ee smaller code cleanups, copy paste errors, or wrong merge resolutions fixed according to MR reviews 2024-02-01 12:05:10 +01:00
Isse
82989979a6 try to fix windows build 2024-02-01 12:01:51 +01:00
Isse
165c88bd74 patch wgpu to 18.2 2024-02-01 12:01:03 +01:00
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
maxicarlos08
a5199a966a
Include required serde feature for enum-map in veloren-common
This previously broke torvus builds, but worked fine for builds here
since veloren-rtsim enabled the serde feature.
2023-11-16 21:47:44 +01:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02: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
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02: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
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
Marcel Märtens
e3f8046691 Change the version number to 0.15 2023-06-30 16:31:00 +02:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +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
Marcel Märtens
cd7d889c13 get rid of oldtime in chrono 2023-05-05 18:25:49 +02:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Marcel Märtens
054f4f9453 update veloren deps 2023-05-04 11:58:43 +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
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
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01: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
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 Märtens
29d0f5b25d update dependencies 2022-09-22 11:57:55 +02:00
Joshua Yanovski
e9a463d459 Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
f481e8cd4f Unrevert fix to shaderc. 2022-09-15 17:24:47 +01:00
Marcel
725fd09ed7 Merge branch 'yusdacra/nix' into 'master'
!2951 with fixed runtime panic

See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
Marcel Märtens
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Imbris
441acd3e48 Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): refactor and update nix flake

See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00:00
Imbris
1888863915 Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu. 2022-09-03 17:26:07 -04:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation 2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen 2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
Socksonme
0e5b472d1d Fix sed regex 2022-08-19 19:45:22 +03:00
Marcel Märtens
fdaaa24338 fix coverage 2022-08-18 09:00:16 +02:00