Merge branch 'develop'

PulsarcGame · Jan 27, 2020 · a57b56c · a57b56c
2 parents 12ab7f3 + ce83056
commit a57b56c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.1-alpha] - 2020-01-26
+
+### Fixed
+- Crosshair fading when hidden is not enabled.
+
 ## [1.3.0-alpha] - 2020-01-26
 
 ### Added
@@ -83,7 +88,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Leaderboard for past scores
 
 
-[unreleased]: https://github.com/PulsarcGame/Pulsarc/compare/v1.3.0-alpha...HEAD
+[unreleased]: https://github.com/PulsarcGame/Pulsarc/compare/v1.3.1-alpha...HEAD
+[1.3.1-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.3.0-alpha...v1.3.1-alpha
 [1.3.0-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.2.0-alpha...v1.3.0-alpha
 [1.2.0-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.1.1-alpha...v1.2.0-alpha
 [1.1.1-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.1.0-alpha...v1.1.1-alpha

diff --git a/Pulsarc/UI/Screens/Gameplay/Crosshair.cs b/Pulsarc/UI/Screens/Gameplay/Crosshair.cs
@@ -18,7 +18,7 @@ public class Crosshair : Drawable
 
         private bool hidden;
         private double hidingAnimationStartTime = -1;
-        private bool FullyHidden => Opacity <= 0 && hidden;
+        private bool FullyHidden => Opacity <= 0;
 
         /// <summary>
         /// The crosshair, or "Judgement Circle" of Pulsarc.
@@ -52,7 +52,7 @@ public override void Draw()
             // NOTE: Current implementation of Hidden gives less "oomph" to zooms
             // because the crosshair gives you a reference point to recognize the zooms.
             // When zooms happen with hidden and no crosshair, it looks like weird SV movement.
-            if (!FullyHidden)
+            if (hidden && !FullyHidden)
             {
                 Hide();
             }

diff --git a/Pulsarc/UI/VersionCounter.cs b/Pulsarc/UI/VersionCounter.cs
@@ -4,7 +4,7 @@ namespace Pulsarc.UI
 {
     public class VersionCounter : TextDisplayElement
     {
-        private const string VERSION_NAME = "v1.3.0-alpha";
+        private const string VERSION_NAME = "v1.3.1-alpha";
 
         // Temporary until we fix font shit.
         private const int X_OFFSET = -22;