diff --git a/Changelogs/6-7-20 - Build 2.md b/Changelogs/6-8-20 - Build 1.md similarity index 75% rename from Changelogs/6-7-20 - Build 2.md rename to Changelogs/6-8-20 - Build 1.md index 0beaa10f..9d43ffe4 100644 --- a/Changelogs/6-7-20 - Build 2.md +++ b/Changelogs/6-8-20 - Build 1.md @@ -1,4 +1,4 @@ -# Changelog for 6/7/20 - Build 2 +# Changelog for 6/8/20 - Build 1 -* Merged changes from the `develop` branch into the `master` branch +* Merged changes from the `develop` branch into the `master` branch. * Trigger support is now available from the merge! diff --git a/src/GameCanvas.cs b/src/GameCanvas.cs index 16bd728d..70e29eb2 100644 --- a/src/GameCanvas.cs +++ b/src/GameCanvas.cs @@ -206,17 +206,10 @@ public void ShowChangelog() else { var changelogText = "" + - " * Added Superdavo0001\'s remount mod into LRTran!\n" + - " * Changelog toggle in the Preferences -> Other.\n" + - " * Turning off the changelog actually works now.\n" + - " * Autosaves now save to their own file (autosave_day.month.year_hours.minutes.trk).\n" + - " * \"\" will now be autosaved in the \"Unnamed Track\" folder.\n" + - " * Autosaves can be configured in Preferences -> Other.\n" + - " * Track changes will always be shown on screen.\n" + - " * Added Multi-Scarf functionality in the Preferences -> Rider.\n" + - " * When the game has enough changed where it will autosave, \"Autosave enabled!\" will appear in the top left corner.\n" + + " * Merged changes from the `develop` branch into the `master` branch.\n" + + " * Trigger support is now available from the merge!\n" + "\n" + - "NOTE: Discord is auto disabled on startup for now until I implement it in a more stable way."; + "NOTE: Discord is still auto disabled on startup for now until I implement it in a more stable way."; var window = MessageBox.Show(this, changelogText, "Changelog for " + Program.Version, MessageBox.ButtonType.YesNoCancel); window.RenameButtonsYN("Previous Changelogs (Github)", "Continue and don\'t show again", "Continue"); diff --git a/src/MainWindow.cs b/src/MainWindow.cs index 5f86568d..8cc14cf3 100644 --- a/src/MainWindow.cs +++ b/src/MainWindow.cs @@ -273,7 +273,7 @@ public void GameUpdate() for (int i = 1; i < Settings.multiScarfAmount; i++) { - insertScarfColor(0x0000FF, 0x00, ((i * Settings.multiScarfSegments))+(i-1)-(1+i)); + insertScarfColor(0x0000FF, 0x00, ((i * Settings.multiScarfSegments)) + (i - 1) - (1 + i)); } } //If edits to the png is toggled update the rider @@ -319,7 +319,6 @@ public void GameUpdate() } } - if (Track.Playing) { if (ReversePlayback) diff --git a/src/Program.cs b/src/Program.cs index dd5f5c68..298f7d8b 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -36,7 +36,7 @@ public static class Program #endif public static string BinariesFolder = "bin"; public readonly static CultureInfo Culture = new CultureInfo("en-US"); - public static string Version = "6/7/20 - Build 1"; + public static string Version = "6/8/20 - Build 1"; public static string TestVersion = ""; public static string NewVersion = null; public static readonly string WindowTitle = "Line Rider: Advanced (Tran\'s fork) " + Version + TestVersion; diff --git a/version b/version index d15f4575..ced81e07 100644 --- a/version +++ b/version @@ -1 +1 @@ -6/7/20 - Build 1 \ No newline at end of file +6/8/20 - Build 1 \ No newline at end of file