Joshua Barretto f1b63732af Merge branch 'master' into 'master' ...

Terrain

Closes #5

See merge request veloren/veloren!66

Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e

2019-04-25 19:35:35 +00:00

..

shaders

add ui text rendering

2019-03-20 01:24:21 -04:00

src

Merge branch 'master' into 'master'

2019-04-25 19:35:35 +00:00

test_assets

adding test assets

2019-04-20 19:13:38 -04:00

.gitignore

Added user-friendly error output for Voxygen

2019-04-25 13:08:46 +01:00

Cargo.toml

Use the directory defined by the OS to store configuration files

2019-04-25 10:24:00 -06:00