Samuel Keiffer 7a62cbbafc Merge branch 'sam/fix-roll-combo' into 'master' ... Fixes being stuck in roll when interrupting combo melee. See merge request veloren/veloren!1831		2021-02-28 18:02:01 +00:00
..
benches	Remove spurious uses of Vox.	2020-09-26 16:30:40 +02:00
net	Added combo component	2021-02-27 14:55:06 -05:00
src	Fixes being stuck in roll when interrupting combo melee.	2021-02-28 08:50:33 -05:00
sys	Made changes to fix torvus	2021-02-27 22:42:11 -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	Retrieves added + New ECS memory layout for plugins	2021-02-22 23:59:32 +01:00