Samuel Keiffer 099ddea165 Merge branch 'juliancoffee/dungeon_rebalance' into 'master' ... Make cultist great again See merge request veloren/veloren!2513		2021-07-01 02:37:39 +00:00
..
assets	Better error signaling in assets::load_dir_expect	2021-06-30 21:06:06 +03: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 'juliancoffee/dungeon_rebalance' into 'master'	2021-07-01 02:37:39 +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	Fix underwater campfires.	2021-06-30 18:36:43 -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