Release 0.15.0

ngld · Jul 29, 2020 · 03766db · 03766db
1 parent f82cb37
commit 03766db
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 7 deletions.
diff --git a/HtmlRenderer/Properties/AssemblyInfo.cs b/HtmlRenderer/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.1.0")]
+[assembly: AssemblyVersion("0.15.0.0")]
diff --git a/OverlayPlugin.Common/Properties/AssemblyInfo.cs b/OverlayPlugin.Common/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.1.0")]
+[assembly: AssemblyVersion("0.15.0.0")]
diff --git a/OverlayPlugin.Core/Controls/NewOverlayDialog.cs b/OverlayPlugin.Core/Controls/NewOverlayDialog.cs
@@ -11,6 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Net;
 
 namespace RainbowMage.OverlayPlugin
 {
@@ -58,7 +59,11 @@ public NewOverlayDialog(PluginMain pluginMain)
  }
 
  cbType.DisplayMember = "Key";
- cbType.SelectedIndex = 0;
+ // Workaround for the special case where no overlay type has been registered.
+ // That still indicates a bug but showing an empty combo box is better than crashing.
+ if (cbType.Items.Count > 0)
+ cbType.SelectedIndex = 0;
+
  presets = PreparePresetCombo(cbPreset);
 
  lblType.Visible = false;
@@ -169,6 +174,16 @@ private void buttonOK_Click(object sender, EventArgs e)
 
  // Reconstruct the overlay to reset the preview state.
  SelectedOverlay = new Overlays.MiniParseOverlay(config, name);
+ if (config.Url == "")
+ {
+ // If the preview didn't load, we try again here to avoid ending up with an empty overlay.
+#if DEBUG
+ var resourcesPath = "file:///" + PluginMain.PluginDirectory.Replace('\\', '/') + "/libs/resources";
+#else
+ var resourcesPath = "file:///" + PluginMain.PluginDirectory.Replace('\\', '/') + "/resources";
+#endif
+ SelectedOverlay.Navigate(preset.Url.Replace("%%", resourcesPath));
+ }
  }
  else
  {
@@ -221,9 +236,22 @@ private void cbPreset_SelectedIndexChanged(object sender, EventArgs e)
  IsLocked = preset.Locked,
  };
 
+ var presetUrl = preset.Url.Replace("%%", resourcesPath);
  var overlay = new Overlays.MiniParseOverlay(config, config.Name);
  overlay.Preview = true;
- overlay.Navigate(preset.Url.Replace("%%", resourcesPath));
+
+ var first = true;
+ overlay.Overlay.Renderer.BrowserLoad += (o, ev) =>
+ {
+ // Once the placeholder is ready, we load the actual overlay.
+ if (first)
+ {
+ first = false;
+ overlay.Navigate(presetUrl);
+ }
+ };
+ // Show a placeholder while the actual overlay is loading.
+ overlay.Navigate(resourcesPath + "/loading.html");
 
  preview = overlay;
  break;

diff --git a/OverlayPlugin.Core/EventSources/EnmityMemory50.cs b/OverlayPlugin.Core/EventSources/EnmityMemory50.cs
@@ -97,6 +97,8 @@ private bool GetPointerAddress()
  if ((DateTime.Now - lastSigScan) < TimeSpan.FromSeconds(5))
  return false;
 
+ lastSigScan = DateTime.Now;
+
  bool success = true;
  bool bRIP = true;
 

diff --git a/OverlayPlugin.Core/OverlayPlugin.Core.csproj b/OverlayPlugin.Core/OverlayPlugin.Core.csproj
@@ -225,6 +225,9 @@
  <Content Include="resources\label.html">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>
+ <Content Include="resources\loading.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  <Content Include="resources\miniparse.html">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>

diff --git a/OverlayPlugin.Core/Properties/AssemblyInfo.cs b/OverlayPlugin.Core/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.1.0")]
+[assembly: AssemblyVersion("0.15.0.0")]
diff --git a/OverlayPlugin.Updater/Properties/AssemblyInfo.cs b/OverlayPlugin.Updater/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.1.0")]
+[assembly: AssemblyVersion("0.15.0.0")]
diff --git a/OverlayPlugin/Properties/AssemblyInfo.cs b/OverlayPlugin/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.1.0")]
+[assembly: AssemblyVersion("0.15.0.0")]
diff --git a/build.ps1 b/build.ps1
@@ -20,6 +20,9 @@ try {
  }
 
  $ENV:PATH = "$VS_PATH\MSBuild\Current\Bin;${ENV:PATH}";
+ if (Test-Path "C:\Program Files\7-Zip\7z.exe") {
+ $ENV:PATH = "C:\Program Files\7-Zip;${ENV:PATH}";
+ }
 
  if ( -not (Test-Path .\OverlayPlugin.Updater\Resources\libcurl.dll)) {
  echo "==> Building cURL..."