Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs
2017-02-22 23:33:14 +02:00
parent 75d047b57e 5006a9af6c
commit 3fcaff0288
23 changed files with 82 additions and 46 deletions
@@ -8,7 +8,7 @@

    <Sprite texture ="captainhat.png" depth="0.6"/>

-    <Body radius="8" density="30"/>
+    <Body width="25" height="15" density="30"/>

    <Wearable limbtype="Head" slots="Any,Head">
      <sprite texture="captainhat.png" limb="Head" origin="0.5,0.9"/>