Commit Graph

76 Commits

Author SHA1 Message Date
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00: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
Christof Petig
4ba80c0e73 fix voxygen compilation without plugins, part 2 2023-10-25 00:05:35 +02:00
Christof Petig
c354fe1b1d conditionally turn off more code (fixes unit test) 2023-10-25 00:05:35 +02:00
Christof Petig
7c4057d7d8 simplify, how can you not love clippy 2023-10-25 00:05:35 +02:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Christof Petig
fc81d6ecd5 fix compilation of voxygen without plugins 2023-10-23 21:47:26 +02:00
Imbris
0413a3e111 Small asset code improvements
* Replace manual Clone impl with derive
* Take advantage of hashbrown's Equivalent trait to simplify using a
  non-allocating key
2023-10-19 12:02:49 -04:00
Christof Petig
252771c411 replace read_at with the more portable workaround 2023-10-18 22:31:25 +02:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
22f8433d22 address imbris suggestions in this new version 2023-10-17 21:07:24 +02:00
Christof Petig
621334d69b clippy fix and tar_source simplification 2023-10-17 21:07:24 +02:00
Christof Petig
64dec7efe2 fix compilation without plugins feature, fixes unit tests 2023-10-17 21:07:24 +02:00
Christof Petig
60336a1c56 improve duplicate error message 2023-10-17 21:07:24 +02:00
Christof Petig
61b7a1ff17 report errors other than not found when combining assets 2023-10-17 21:07:24 +02:00
Christof Petig
8dce52221b separate combined cache and fs cache 2023-10-17 21:07:23 +02:00
Christof Petig
baccdeb22f move plugin list into source 2023-10-17 21:07:23 +02:00
Christof Petig
3a6d94bd3c register_tar with the cache object 2023-10-17 21:07:23 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh"
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Marcel Märtens
054f4f9453 update veloren deps 2023-05-04 11:58:43 +02:00
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01:00
Joshua Barretto
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01: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
Marcel Märtens
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
juliancoffee
847ee1c1b1 Implement i18n-tooling
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
juliancoffee
f2df1adf27 Improve documentation 2022-08-07 16:21:58 +03:00
juliancoffee
8ba50e62d5 New i18n implementation based on Fluent 2022-08-06 21:45:23 +03:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Benoît du Garreau
8488c7b25e Upgrade assets_manager to 0.8.0 and image to 0.24
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
juliancoffee
ebe95ebe33 Move common-assets to 2021 edition 2022-01-26 15:09:00 +02:00
fetsorn
338dec41ab Fix typo "incase"->"in case" 2022-01-06 18:28:05 +00:00
Benoît du Garreau
8cf871f449 Edit log message as suggested 2021-12-13 18:54:30 +01:00
Benoît du Garreau
287896facd Remove common_assets::path_of` 2021-12-13 18:17:23 +01:00
Benoît du Garreau
aca088388b Update assets_manager to 0.7 2021-12-12 22:11:47 +01:00
Marcel
de5ca67615 Merge branch 'evanmeek/friendly_error_message' into 'master'
Add friendly error message for override assets.

See merge request veloren/veloren!2983
2021-12-07 15:35:40 +00:00
Evan
6bc8bbb4ed Add friendly error message for override assets. 2021-12-07 15:35:40 +00:00
Marcel Märtens
e29ede7c97 updating dependencies,
cannot update the following dependencies:
 - vek: Sharps SIMD isnt upstream
 - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
 - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
 - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
 - wgpu: cant update due new version doesnt support DX11

Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Benoît du Garreau
ef1c51332d Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
juliancoffee
6c1ecc9766 Add support for override asset folder
- ASSETS_OVERRIDE environment variable with asset path which has higher
  priority.
2021-09-02 20:24:23 +03:00
juliancoffee
bdce07e7a0 Adress review, add test for structs 2021-08-06 13:04:01 +03:00