Marcel 521e1eacf3 Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371		2021-06-06 16:56:21 +00:00
..
assets	Merge branch 'alphyr/guess_image_format' into 'master'	2021-05-12 18:41:22 +00:00
base	Fix ProfSpan constructor being private	2021-06-03 00:10:06 -04:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	include origin into system name	2021-04-20 01:30:27 +02:00
frontend	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
net	Update toolchain	2021-05-31 20:44:57 -04:00
src	Merge branch 'aweinstock/add-models-20210603' into 'master'	2021-06-06 16:56:21 +00:00
state	Don't remesh chunk vertex data on sprite update.	2021-05-11 12:58:15 -07:00
systems	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
build.rs	fix and improve nix build: actually output a proper veloren voxygen package now	2020-11-25 02:00:50 +03:00
Cargo.toml	Added non-admin moderators and timed bans.	2021-05-09 21:19:16 -07:00