From 75c62d6b327a70d17a53cc6afc16c0328aa79f38 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 12 Jan 2020 13:12:23 -0600 Subject: [PATCH 1/9] update version info --- Version/VersionInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs index b2114a1dde..8fb864f452 100644 --- a/Version/VersionInfo.cs +++ b/Version/VersionInfo.cs @@ -3,9 +3,9 @@ using System.IO; internal static class VersionInfo { // keep this updated at every major release - public const string Mainversion = "2.3.2"; // Use numbers only or the new version notification won't work - public static readonly string RELEASEDATE = "June 18, 2019"; - public static readonly bool DeveloperBuild = true; + public const string Mainversion = "2.3.3"; // Use numbers only or the new version notification won't work + public static readonly string RELEASEDATE = "January 12, 2020"; + public static readonly bool DeveloperBuild = false; public static readonly string HomePage = "http://tasvideos.org/BizHawk.html"; public static readonly string CustomBuildString; From e67cd796449b379fc0292059868c59c7cc8f149e Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 13 Jan 2020 18:56:19 -0600 Subject: [PATCH 2/9] unlock vetrex core in path config, in preparation for officially releasing the core (should have been done last release --- BizHawk.Client.EmuHawk/config/PathConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs index 5aa83e44b3..65dfb317f3 100644 --- a/BizHawk.Client.EmuHawk/config/PathConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PathConfig.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk return; } - string[] coresToHide = { "VEC", "GB4x", "O2", "ChannelF", "AmstradCPC" }; + string[] coresToHide = { "GB4x", "O2", "ChannelF", "AmstradCPC" }; foreach (var core in coresToHide) { From 15191106917671724be05d508b4653a1b796e86d Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 13:22:19 -0600 Subject: [PATCH 3/9] Always refresh the APIHawk library instances instead of checking for null, fixes #1791 --- BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs index cb25e3a481..c88e2dd838 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs @@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk emuHawkLibrary.MainForm = _mainForm; } - ApiHawkContainerInstance ??= InitApiHawkContainerInstance(serviceProvider, ConsoleLuaLibrary.LogOutput); + ApiHawkContainerInstance = InitApiHawkContainerInstance(serviceProvider, ConsoleLuaLibrary.LogOutput); if (instance is DelegatingLuaLibraryEmu dlgInstanceEmu) dlgInstanceEmu.APIs = ApiHawkContainerInstance; // this is necessary as the property has the `new` modifier else if (instance is DelegatingLuaLibrary dlgInstance) dlgInstance.APIs = ApiHawkContainerInstance; From 67ff6abb17cf02e574fb455bb1e60837f2a25fb4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 13:35:22 -0600 Subject: [PATCH 4/9] Tastudio - fix clone input when cloing multiple rows --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index d65c832519..a5cc23c616 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -736,11 +736,12 @@ namespace BizHawk.Client.EmuHawk if (TasView.AnyRowsSelected) { var framesToInsert = TasView.SelectedRows; - var insertionFrame = Math.Min(TasView.LastSelectedIndex ?? 0 + 1, CurrentTasMovie.InputLogLength); + var insertionFrame = Math.Min((TasView.LastSelectedIndex ?? 0) + 1, CurrentTasMovie.InputLogLength); var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; var inputLog = framesToInsert - .Select(frame => CurrentTasMovie.GetInputLogEntry(frame)); + .Select(frame => CurrentTasMovie.GetInputLogEntry(frame)) + .ToList(); CurrentTasMovie.InsertInput(insertionFrame, inputLog); From f9435fb17f60a50870220195aac3acf9834ef028 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 14:53:12 -0600 Subject: [PATCH 5/9] Lua - tastudio.applyinputchanges() - always refresh tastudio - fixes #1799 --- .../tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs index 20ba2565ad..610576eb98 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs @@ -306,6 +306,7 @@ namespace BizHawk.Client.EmuHawk } } _changeList.Clear(); + Tastudio.Refresh(); Tastudio.JumpToGreenzone(); Tastudio.DoAutoRestore(); } From a08c0a394c8dc8752b8f0835891d8c3014c5489c Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 15:48:33 -0600 Subject: [PATCH 6/9] Tastudio - better tracking of which frame to invalidate from when input painting, fixes #1790 --- .../tools/TAStudio/TAStudio.ListView.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index c441fb982c..1e358c48a9 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -24,6 +24,7 @@ namespace BizHawk.Client.EmuHawk private bool _selectionDragState; private bool _suppressContextMenu; private int _startRow; + private int _paintingMinFrame = -1; // Editing analog input private string _floatEditColumn = ""; @@ -323,6 +324,10 @@ namespace BizHawk.Client.EmuHawk { offsetX = TasView.HorizontalOrientation ? 2 : 7; text = index.ToString().PadLeft(CurrentTasMovie.InputLogLength.ToString().Length, '0'); + if (_paintingMinFrame >= 0) + { + text += " " + _paintingMinFrame.ToString(); + } } else { @@ -546,6 +551,7 @@ namespace BizHawk.Client.EmuHawk if (e.Button == MouseButtons.Left) { _leftButtonHeld = true; + _paintingMinFrame = frame; // SuuperW: Exit float editing mode, or re-enter mouse editing if (FloatEditingMode) @@ -785,6 +791,7 @@ namespace BizHawk.Client.EmuHawk _startSelectionDrag = false; _startBoolDrawColumn = ""; _startFloatDrawColumn = ""; + _paintingMinFrame = -1; TasView.ReleaseCurrentCell(); // Exit float editing if value was changed with cursor @@ -839,7 +846,7 @@ namespace BizHawk.Client.EmuHawk // So now we have to ensure that all the edited frames are invalidated if (CurrentTasMovie.LastEditedFrame < Emulator.Frame) { - GoToFrame(CurrentTasMovie.LastEditedFrame); + GoToFrame(_paintingMinFrame); } } @@ -950,6 +957,11 @@ namespace BizHawk.Client.EmuHawk return; } + if (_paintingMinFrame >= 0) + { + _paintingMinFrame = Math.Min(_paintingMinFrame, e.NewCell?.RowIndex ?? 0); + } + // skip rerecord counting on drawing entirely, mouse down is enough // avoid introducing another global bool wasCountingRerecords = CurrentTasMovie.IsCountingRerecords; From 41c4c8a9515ff405b1e3b7f6dc132e76eda62d5f Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 15:52:01 -0600 Subject: [PATCH 7/9] oops --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 1e358c48a9..5cd2c9e60f 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -324,10 +324,6 @@ namespace BizHawk.Client.EmuHawk { offsetX = TasView.HorizontalOrientation ? 2 : 7; text = index.ToString().PadLeft(CurrentTasMovie.InputLogLength.ToString().Length, '0'); - if (_paintingMinFrame >= 0) - { - text += " " + _paintingMinFrame.ToString(); - } } else { From 1cd5675ce0d44b1538832c8564b7e868ee02dee9 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 15:59:37 -0600 Subject: [PATCH 8/9] Tastudio - fix crash when trying to use alt+drag after autoloading a .tasproj --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 1fc18e0037..52ce907d1b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -465,6 +465,11 @@ namespace BizHawk.Client.EmuHawk TasView.AllColumns.ColumnsChanged(); + SetupBoolPatterns(); + } + + private void SetupBoolPatterns() + { // Patterns int bStart = 0; int fStart = 0; @@ -532,6 +537,7 @@ namespace BizHawk.Client.EmuHawk MainForm.SetMainformMovieInfo(); Global.MovieSession.ReadOnly = true; SetSplicer(); + SetupBoolPatterns(); } #endregion From 16f5da9f9c2e57ac7a8bb70b2028e3a9501127b8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Jan 2020 16:16:18 -0600 Subject: [PATCH 9/9] update version info --- Version/VersionInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs index 8fb864f452..d8d33f4e3c 100644 --- a/Version/VersionInfo.cs +++ b/Version/VersionInfo.cs @@ -3,8 +3,8 @@ using System.IO; internal static class VersionInfo { // keep this updated at every major release - public const string Mainversion = "2.3.3"; // Use numbers only or the new version notification won't work - public static readonly string RELEASEDATE = "January 12, 2020"; + public const string Mainversion = "2.4.0"; // Use numbers only or the new version notification won't work + public static readonly string RELEASEDATE = "January 18, 2020"; public static readonly bool DeveloperBuild = false; public static readonly string HomePage = "http://tasvideos.org/BizHawk.html";