Samuel Keiffer 85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master' ... Fixed CircleCharge and buffed Rugged Hide droppers See merge request veloren/veloren!2613		2021-07-23 14:56:36 +00:00
..
assets	Add a feature to optionnally disable hot-reloading	2021-07-06 00:27:09 +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	Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds.	2021-07-04 09:47:18 +00:00
net	Apply same member order as in trait	2021-07-20 09:43:52 +02:00
src	Merge branch 'knightresspaladin/fix-circle-charge' into 'master'	2021-07-23 14:56:36 +00:00
state	implement slowjob metrics to measuere time in queue and execution time	2021-07-22 19:31:21 +02:00
systems	Fix check before calculating entity pushback, was causing a NaN and probably other bugs	2021-07-19 01:31:40 -04:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	update depednencies	2021-07-08 12:21:02 +02:00