Merge branch 'swilliams/golem-hitbox-fix' into 'master'

Swilliams/golem hitbox fix

See merge request veloren/veloren!1712

CHANGELOG.md

@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed camera smoothing to be off by default.
 - Fixed AI behavior so only humanoids will attempt to roll
 - Footstep SFX is now dependant on distance moved, not time since last play
+- Increased the hitbox of the Stonework Defender and Mindflayer to better fit their models.
 
 ### Removed
 

common/src/comp/body.rs

@@ -183,8 +183,8 @@ impl Body {
             Body::Dragon(_) => 8.0,
             Body::BirdSmall(_) => 0.3,
             Body::FishSmall(_) => 0.3,
-            Body::BipedLarge(_) => 0.75,
-            Body::Golem(_) => 0.4,
+            Body::BipedLarge(_) => 1.5,
+            Body::Golem(_) => 2.5,
             Body::Object(_) => 0.4,
         }
     }
@@ -243,9 +243,10 @@ impl Body {
                 biped_large::Species::Slysaurok => 2.3,
                 biped_large::Species::Occultsaurok => 2.8,
                 biped_large::Species::Mightysaurok => 2.3,
+                biped_large::Species::Mindflayer => 4.8,
                 _ => 4.6,
             },
-            Body::Golem(_) => 5.8,
+            Body::Golem(_) => 5.0,
             Body::Object(_) => 1.0,
         }
     }