Ben Wallis 0cf42e9c84 Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui		2021-06-18 22:04:36 +01:00
..
assets	Removed .jpeg as valid image format (to encourage consistency)	2021-06-18 12:42:08 +01:00
base	Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder	2021-06-14 21:42:50 -04:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	Change the version number to 0.10	2021-06-12 10:14:07 +02:00
frontend	merge from master	2021-06-14 21:31:28 +01:00
net	Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients	2021-06-17 19:55:21 +01:00
src	Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui	2021-06-18 22:04:36 +01:00
state	Change the version number to 0.10	2021-06-12 10:14:07 +02:00
systems	Merge branch 'aweinstock/tighten_e2t' into 'master'	2021-06-18 16:27:20 +00:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	Change the version number to 0.10	2021-06-12 10:14:07 +02:00