Marcel f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master' ... Update `assets_manager` to 0.5 See merge request veloren/veloren!2501		2021-06-27 15:50:16 +00:00
..
assets	Update assets_manager to 0.5	2021-06-26 12:05:40 +02:00
base	Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it	2021-06-19 04:27:50 -04:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00
frontend	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00
net	Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings.	2021-06-24 23:03:24 -04:00
src	Merge branch 'alphyr/assets_manager0_5' into 'master'	2021-06-27 15:50:16 +00:00
state	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00
systems	Balance tweaks.	2021-06-23 22:38:37 -05:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00