Justin Shipsey f050aeb273 Merge branch 'master' into 'slipped/swim' ... # Conflicts: # voxygen/src/anim/src/character/swim.rs		2020-08-09 15:13:56 +00:00
..
cache.rs	nepo/new bones	2020-08-08 22:37:50 +00:00
load.rs	nepo/new bones	2020-08-08 22:37:50 +00:00
mod.rs	swim alterations to condense the body on strong turns	2020-08-08 13:47:32 -04:00