Merge branch 'master' of https://bitbucket.org/Regalis11/barotrauma

2016-03-03 21:18:53 +02:00
parent 40714c1102 f97ff4ca46
commit b4ff867607
8 changed files with 151 additions and 68 deletions
@@ -36,7 +36,7 @@
  
    <Sprite texture="weapons.png" sourcerect="0,25,98,25" depth="0.5"/>

-    <Body width="90" height="30" density="10"/>
+    <Body width="90" height="30" density="50"/>

    <Holdable slots="Any,RightHand+LeftHand" controlpose="true"
              holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>