Marcel 1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' ... Don't apply e2e pushback during a forced movement character state. See merge request veloren/veloren!2429		2021-06-14 14:42:01 +00:00
..
audio	Added sfx. Addressed comments.	2021-05-04 08:45:12 -04:00
background	new bgs	2021-06-06 19:30:37 +02:00
element	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
font	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
i18n	Merge branch 'aweinstock/forcemove-no-pushback' into 'master'	2021-06-14 14:42:01 +00:00
shaders	cave adjustments	2021-06-07 11:02:34 +02:00
texture	Remove unused waves texture	2021-06-03 00:10:05 -04:00
voxel	Cactus Colada	2021-06-13 13:52:56 +02:00
item_image_manifest.ron	Merge branch 'aweinstock/mining-skill-tree' into 'master'	2021-06-14 14:19:06 +00:00
logo.ico	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00
net.veloren.veloren.desktop	Update AppData manifest to conform guidelines	2020-04-16 05:25:04 +00:00
net.veloren.veloren.metainfo.xml	Update AppData manifest to conform guidelines	2020-04-16 05:25:04 +00:00
net.veloren.veloren.png	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00