Samuel Keiffer a2c19cd047 Merge branch 'aweinstock/trade-requestitem' into 'master' ...

During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829

2021-03-01 02:39:36 +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

Merge branch 'aweinstock/trade-requestitem' into 'master'

2021-03-01 02:39:36 +00: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