Marcel ec7d3b5e37 Merge branch 'swilliams/give_item_fix' into 'master' ... Fix for Issue 1210 See merge request veloren/veloren!2484		2021-06-20 23:26:59 +00:00
..
assets	Removed .jpeg as valid image format (to encourage consistency)	2021-06-18 12:42:08 +01: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	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04:00
src	Added another .replace	2021-06-20 22:55:58 +01: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	Remove tracy features that are no longer needed now that macros have been fixed	2021-06-19 04:27:50 -04: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