From f95260e5afefec1be8311ec61903610962feddf4 Mon Sep 17 00:00:00 2001
From: Komefai <komefai@users.noreply.github.com>
Date: Mon, 15 Jan 2018 06:17:41 +0000
Subject: [PATCH] release v0.5.2

---
 PS4Macro/Forms/MainForm.Designer.cs |  18 +++++++--------
 PS4Macro/Properties/AssemblyInfo.cs |   4 ++--
 README.md                           |  34 ++++++++++++++++++++--------
 _resources/Screenshot_0_5_2.png     | Bin 0 -> 5109 bytes
 4 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 _resources/Screenshot_0_5_2.png

diff --git a/PS4Macro/Forms/MainForm.Designer.cs b/PS4Macro/Forms/MainForm.Designer.cs
index 3e5439f..0568458 100644
--- a/PS4Macro/Forms/MainForm.Designer.cs
+++ b/PS4Macro/Forms/MainForm.Designer.cs
@@ -62,13 +62,13 @@ private void InitializeComponent()
             this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.imageHashToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.resizeRemotePlayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.macroCompressorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.remapperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.statusHighlightLabel = new System.Windows.Forms.Label();
             this.scriptButton = new System.Windows.Forms.Button();
             this.loopCheckBox = new System.Windows.Forms.CheckBox();
-            this.macroCompressorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.statusStrip.SuspendLayout();
             this.menuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -351,6 +351,13 @@ private void InitializeComponent()
             this.resizeRemotePlayToolStripMenuItem.Text = "Resize Remote Play";
             this.resizeRemotePlayToolStripMenuItem.Click += new System.EventHandler(this.resizeRemotePlayToolStripMenuItem_Click);
             // 
+            // macroCompressorToolStripMenuItem
+            // 
+            this.macroCompressorToolStripMenuItem.Name = "macroCompressorToolStripMenuItem";
+            this.macroCompressorToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.macroCompressorToolStripMenuItem.Text = "Macro Compressor";
+            this.macroCompressorToolStripMenuItem.Click += new System.EventHandler(this.macroCompressorToolStripMenuItem_Click);
+            // 
             // remapperToolStripMenuItem
             // 
             this.remapperToolStripMenuItem.Name = "remapperToolStripMenuItem";
@@ -405,13 +412,6 @@ private void InitializeComponent()
             this.loopCheckBox.UseVisualStyleBackColor = true;
             this.loopCheckBox.CheckedChanged += new System.EventHandler(this.loopCheckBox_CheckedChanged);
             // 
-            // macroCompressorToolStripMenuItem
-            // 
-            this.macroCompressorToolStripMenuItem.Name = "macroCompressorToolStripMenuItem";
-            this.macroCompressorToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
-            this.macroCompressorToolStripMenuItem.Text = "Macro Compressor";
-            this.macroCompressorToolStripMenuItem.Click += new System.EventHandler(this.macroCompressorToolStripMenuItem_Click);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -432,7 +432,7 @@ private void InitializeComponent()
             this.MaximizeBox = false;
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "PS4 Macro - v0.5.1 (BETA)";
+            this.Text = "PS4 Macro - v0.5.2 (BETA)";
             this.Load += new System.EventHandler(this.MainForm_Load);
             this.statusStrip.ResumeLayout(false);
             this.statusStrip.PerformLayout();
diff --git a/PS4Macro/Properties/AssemblyInfo.cs b/PS4Macro/Properties/AssemblyInfo.cs
index e2637ef..9b1fae1 100644
--- a/PS4Macro/Properties/AssemblyInfo.cs
+++ b/PS4Macro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.5.1.0")]
-[assembly: AssemblyFileVersion("0.5.1.0")]
+[assembly: AssemblyVersion("0.5.2.0")]
+[assembly: AssemblyFileVersion("0.5.2.0")]
diff --git a/README.md b/README.md
index b8135dd..d4f4569 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Automation utility for PS4 Remote Play written in C# using [PS4RemotePlayInterce
 
 #### Screenshot
 
-![Screenshot](https://raw.githubusercontent.com/komefai/PS4Macro/master/_resources/Screenshot_0_5_1.png)
+![Screenshot](https://raw.githubusercontent.com/komefai/PS4Macro/master/_resources/Screenshot_0_5_2.png)
 
 ## Usage
 
@@ -30,6 +30,7 @@ You can create `settings.xml` and place it with the executable to override defau
 | Setting | Description | Default
 | --- | --- | --- |
 | AutoInject | Automatically poll for PS4 Remote Play and inject whenever possible | false |
+| BypassInjection | Bypass the injection for debugging purposes | false |
 | EmulateController | Run with controller emulation (use without a controller) | false |
 | ShowConsole | Open debugging console on launch | false |
 | StartupFile | Absolute or relative path to the file to load on launch (can be xml or dll) | null |
@@ -40,6 +41,7 @@ You can create `settings.xml` and place it with the executable to override defau
 <?xml version="1.0" encoding="utf-8"?>
 <Settings>
   <AutoInject>true</AutoInject>
+  <BypassInjection>false</BypassInjection>
   <EmulateController>true</EmulateController>
   <ShowConsole>true</ShowConsole>
   <StartupFile>MyMacro.xml</StartupFile>
@@ -50,9 +52,25 @@ You can create `settings.xml` and place it with the executable to override defau
 
 As of version 0.5.0, you can pass command line arguments to PS4Macro.exe and override the values in settings.xml. This allows you to create multiple shortcuts to PS4Macro.exe and have each of them override the settings when switching between games.
 
-##### Example
+#### Arguments
 
-`PS4Macro.exe --AutoInject --EmulateController --ShowConsole=false --StartupFile="C:\macro.xml"`
+| Argument | Description | Default
+| --- | --- | --- |
+| SettingsFile | Absolute or relative path to the settings file (will take priority) | null |
+
+#### Examples
+
+##### Override settings using arguments
+
+```bash
+C:\> PS4Macro.exe --AutoInject --EmulateController --ShowConsole=false --StartupFile="C:\macro.xml"
+```
+
+##### Override default settings file (highest priority)
+
+```bash
+C:\> PS4Macro.exe --SettingsFile="C:\custom-settings.xml"
+```
 
 ## Remapper
 
@@ -122,14 +140,10 @@ Update-Package –reinstall PS4RemotePlayInterceptor
 
 ## To-Do List
 
-- ~~Save/Load~~
-- ~~Keyboard Shortcuts~~
-- ~~Status Indicators~~
-- ~~Scripting~~
-- ~~Use without DualShock controller~~
-- Improve Scripting API Docs
-- Playback Timeline UI
+- Improve scripting API docs
+- Playback timeline UI
 - Macro editor tool
+- Mouse support for Remapper
 - ...
 
 ## Resources
diff --git a/_resources/Screenshot_0_5_2.png b/_resources/Screenshot_0_5_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0a650c782ec939b9b4ce2708208aac28d053bf
GIT binary patch
literal 5109
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
X$RM6CAsMK@a%f8O>T;FOO+)_+*Iv+C

literal 0
HcmV?d00001