Joshua Barretto 269c6171e4 Merge branch 'DaforLynx/aeh' into 'master' ... Sfx fixes and new test See merge request veloren/veloren!2529		2021-06-30 11:43:01 +00:00
..
audio	Sfx fixes and new test	2021-06-30 11:43:00 +00:00
background	Added JPEG backgrounds	2021-06-18 12:28:55 +01:00
element	Added ensnared debuff icon.	2021-06-23 22:38:16 -05:00
font	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
i18n	Merge branch 'alphyr/assets_manager0_5' into 'master'	2021-06-27 15:50:16 +00:00
shaders	Merge branch 'snowram/death-outcome' into 'master'	2021-06-28 23:18:45 +00:00
texture	Remove unused waves texture	2021-06-03 00:10:05 -04:00
voxel	Add CorruptionSpores	2021-06-30 03:33:06 +03:00
item_image_manifest.ron	Add CorruptionSpores	2021-06-30 03:33:06 +03: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