Imbris 97148cb6bb Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md		2020-04-01 20:42:27 +00:00
..
audio	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
background	new loading screen bg	2020-03-20 13:01:31 +01:00
element	small fix	2020-03-28 18:06:00 +01:00
font	Add Turkish (Turkey) translation file	2020-03-31 19:52:45 +02:00
i18n	Merge branch 'master' into 'combat'	2020-04-01 20:42:27 +00:00
shaders	Better water shaders	2020-03-27 15:13:36 +00:00
texture	Added clouds	2019-11-19 19:09:22 +00:00
voxel	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
item_image_manifest.ron	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
logo.ico	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
net.veloren.veloren.appdata.xml	Add desktop file and AppData manifest	2020-02-27 16:25:07 -05:00
net.veloren.veloren.desktop	Add desktop file and AppData manifest	2020-02-27 16:25:07 -05:00
net.veloren.veloren.png	Add desktop file and AppData manifest	2020-02-27 16:25:07 -05:00