Justin Shipsey 9ad8804b60 Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835		2021-03-02 01:29:46 +00:00
..
anim	final asset corrections, fix glider anim	2021-03-01 17:37:47 -05:00
benches	Clean and update dependencies	2021-02-17 01:27:06 -08:00
examples	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf	2020-08-20 20:34:59 +02:00
src	Merge branch 'item-stacking-and-splitting' into 'master'	2021-03-02 00:08:47 +00:00
build.rs	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
Cargo.toml	Update Network Protocol	2021-02-22 17:34:55 +01:00
clippy.toml	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf	2020-08-20 20:34:59 +02:00