Marcel 5ac731254d Merge branch 'sam/yeet-inputs' into 'master' ...

Reworked Controller Inputs to use Control Actions

See merge request veloren/veloren!1900

2021-03-15 01:32:02 +00:00

..

common

Merge branch 'sam/yeet-inputs' into 'master'

2021-03-15 01:32:02 +00:00

voxygen

Merge branch 'snowram/new-npcs' into 'master'

2021-03-15 00:10:46 +00:00

world

Sarrakitty/small fixes

2021-02-08 20:37:24 +00:00