veloren/voxygen
Timo Koesters 48a905ba86 Merge branch 'attack' into 'master'
Attack fixes

See merge request veloren/veloren!179

Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf
2019-05-26 16:07:08 +00:00
..
shaders Added snow to mountains, fixed hash sub-chunk allocation failure 2019-05-25 05:51:45 +01:00
src Merge branch 'attack' into 'master' 2019-05-26 16:07:08 +00:00
Cargo.toml Make Failed to tick go back to the main screen and move to ron 2019-05-26 12:58:43 +02:00