Marcel 593d8fa4b5 Merge branch 'xMAC94x/update_vek' into 'master' ... switch to upstream vek again See merge request veloren/veloren!3342		2022-05-02 08:34:21 +00:00
..
assets	Move common-assets to 2021 edition	2022-01-26 15:09:00 +02:00
base	put tracy in a seperate scope	2022-03-08 20:57:55 +01:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	Move Veloren to 2021 edition	2022-01-26 16:46:40 +02:00
frontend	Small logging filter directives refactor including removing: "ignoring ``: invalid filter directive"message that always appeared when using RUST_LOG env var	2022-03-13 01:37:52 -05:00
net	switch to upstream vek again	2022-04-28 09:10:55 +02:00
src	Fix villagers seeing cultists and familiar enemies through objects.	2022-05-01 15:06:43 +00:00
state	switch to upstream vek again	2022-04-28 09:10:55 +02:00
systems	switch to upstream vek again	2022-04-28 09:10:55 +02:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	switch to upstream vek again	2022-04-28 09:10:55 +02:00