Samuel Keiffer 22ef002238 Merge branch 'aweinstock/combat-music' into 'master' ...

Add combat music transitions based on number of enemies in player radius.

See merge request veloren/veloren!2077

2021-04-12 06:01:19 +00:00

..

common

UI fixes and more

2021-04-11 03:49:47 +00:00

server

airship movement bits

2021-03-21 21:43:49 -04:00

voxygen

Merge branch 'aweinstock/combat-music' into 'master'

2021-04-12 06:01:19 +00:00

world

New default world map, default continent scale doubled

2021-03-28 17:07:38 +01:00