Author: Not specified Language: text
Description: Not specified Timestamp: 2013-06-11 03:41:46 +0000
View raw paste Reply
  1. $ git diff
  2. diff --git a/Assets/Scripts/Options.cs b/Assets/Scripts/Options.cs
  3. index 437553f..82f85b6 100755
  4. --- a/Assets/Scripts/Options.cs
  5. +++ b/Assets/Scripts/Options.cs
  6. @@ -42,6 +42,7 @@ public static class Options {
  7.                 keyBindings["anti-spin"] = KeyCode.Space;
  8.                 keyBindings["align-prograde"] = KeyCode.Alpha1;
  9.                 keyBindings["align-retrograde"] = KeyCode.Alpha2;
  10. +               keyBindings["align-target"] = KeyCode.Alpha3;^M
  11.                 intValues["throttle-axis"] = 2;
  12.                 intValues["throttle-axis-invert"] = 0;
  13.                 intValues["yaw-axis"] = 3;
  14. diff --git a/Assets/Scripts/Ships/IShipController.cs b/Assets/Scripts/Ships/IShi
  15. index b3ef169..1426f0a 100755
  16. --- a/Assets/Scripts/Ships/IShipController.cs
  17. +++ b/Assets/Scripts/Ships/IShipController.cs
  18. @@ -15,5 +15,6 @@ public interface IShipController {
  19.         bool AntiSpin { get; }
  20.         bool AlignPrograde { get; }
  21.         bool AlignRetrograde { get; }
  22. +       bool AlignTarget { get; }^M
  23.         bool FireLasers { get; }
  24.  }
  25. diff --git a/Assets/Scripts/Ships/LocalController.cs b/Assets/Scripts/Ships/Loca
  26. index e0a0b9c..4fb3985 100755
  27. --- a/Assets/Scripts/Ships/LocalController.cs
  28. +++ b/Assets/Scripts/Ships/LocalController.cs
  29. @@ -116,6 +116,10 @@ public class LocalController : MonoBehaviour, IShipControll
  30.                 get { return Input.GetKey(Options.keyBindings["align-retrograde"
  31.         }
  32.  
  33. +       public bool AlignTarget {^M
  34. +               get { return Input.GetKey(Options.keyBindings["align-target"]);
  35. +       }^M
  36. +^M
  37.         public bool FireLasers {
  38.                 get { return Input.GetKey(Options.keyBindings["fire-laser"]); }
  39.         }
  40. diff --git a/Assets/Scripts/Ships/NetworkedControls.cs b/Assets/Scripts/Ships/Ne
  41. index 7421f8a..214b2c6 100755
  42. --- a/Assets/Scripts/Ships/NetworkedControls.cs
  43. +++ b/Assets/Scripts/Ships/NetworkedControls.cs
  44. @@ -24,6 +24,7 @@ public class NetworkedControls : MonoBehaviour, ISyncable {
  45.                 m.Write(controller.AntiSpin);
  46.                 m.Write(controller.AlignPrograde);
  47.                 m.Write(controller.AlignRetrograde);
  48. +               m.Write(controller.AlignTarget);^M
  49.                 m.Write(controller.FireLasers);
  50.                 m.WritePadBits();
  51.                 m.Write(controller.Yaw);
  52. @@ -42,6 +43,7 @@ public class NetworkedControls : MonoBehaviour, ISyncable {
  53.                 rc.AntiSpin = m.ReadBoolean();
  54.                 rc.AlignPrograde = m.ReadBoolean();
  55.                 rc.AlignRetrograde = m.ReadBoolean();
  56. +               rc.AlignTarget = m.ReadBoolean();^M
  57.                 rc.FireLasers = m.ReadBoolean();
  58.                 m.SkipPadBits();
  59.                 rc.Yaw = m.ReadFloat();
  60. diff --git a/Assets/Scripts/Ships/RemoteController.cs b/Assets/Scripts/Ships/Rem
  61. index 2f7ad42..663eb52 100755
  62. --- a/Assets/Scripts/Ships/RemoteController.cs
  63. +++ b/Assets/Scripts/Ships/RemoteController.cs
  64. @@ -14,5 +14,6 @@ public class RemoteController : MonoBehaviour, IShipController
  65.         public bool AntiSpin { get; set; }
  66.         public bool AlignPrograde { get; set; }
  67.         public bool AlignRetrograde { get; set; }
  68. +       public bool AlignTarget { get; set; }^M
  69.         public bool FireLasers { get; set; }
  70.  }
  71. diff --git a/Assets/Scripts/Ships/Ship.cs b/Assets/Scripts/Ships/Ship.cs
  72. index ac90ac7..23892d6 100755
  73. --- a/Assets/Scripts/Ships/Ship.cs
  74. +++ b/Assets/Scripts/Ships/Ship.cs
  75. @@ -68,6 +68,9 @@ public class Ship : MonoBehaviour, ISyncable {
  76.                 else if (controller.AlignRetrograde && !controller.AntiSpin) {
  77.                         autopilot.RotateToward(rigidbody.velocity, turningTorque
  78.                 }
  79. +               else if (controller.AlignTarget && !controller.AntiSpin) {^M
  80. +                       autopilot.RotateToward(rigidbody.velocity, turningTorque
  81. +               }^M
  82.  
  83.                 foreach (var laser in Attachments.OfType<Laser>()) {
  84.                         laser.Firing = controller.FireLasers;
  85. (END)
View raw paste Reply