Merged linux changes, water effect using a BasicEffect and a simpler pixel shader, multi-colored wires

2015-09-08 21:55:27 +03:00
parent 7eae6fb026
commit ea15397725
18 changed files with 221 additions and 197 deletions
@@ -8,7 +8,7 @@

    <Sprite texture ="railgunbase.png"/>

-    <Turret barrelsprite="railgunbarrel.png" canbeselected = "true" linkable="true" origin="0.5, 0.85" barrelpos="117, 57" 
+    <Turret barrelsprite="railgunbarrel.png" canbeselected = "true" linkable="true" origin="0.5, 0.85" barrelpos="128, 128" 
            rotationlimits="180,360"
            powerconsumption="500.0">
      <StatusEffect type="OnUse" target="This" sound="Content/Items/Weapons/railgun.ogg">