diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip index b1a96033..eb2c1943 100644 --- a/Installer/ScpToolkit Setup.aip +++ b/Installer/ScpToolkit Setup.aip @@ -15,10 +15,10 @@ - + - + diff --git a/ScpCleanWipe/Properties/CommonInfo.cs b/ScpCleanWipe/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpCleanWipe/Properties/CommonInfo.cs +++ b/ScpCleanWipe/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpControl/Properties/CommonInfo.cs b/ScpControl/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpControl/Properties/CommonInfo.cs +++ b/ScpControl/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpControl/Properties/Settings.Designer.cs b/ScpControl/Properties/Settings.Designer.cs index af4b0da0..0435e8d2 100644 --- a/ScpControl/Properties/Settings.Designer.cs +++ b/ScpControl/Properties/Settings.Designer.cs @@ -574,12 +574,12 @@ public bool IsVBusDisabled { [global::System.Configuration.SettingsProviderAttribute(typeof(ScpControl.Utilities.PortableSettingsProvider))] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool AlwaysDisconnectVirtualBusDevice { + public bool AlwaysUnPlugVirtualBusDevice { get { - return ((bool)(this["AlwaysDisconnectVirtualBusDevice"])); + return ((bool)(this["AlwaysUnPlugVirtualBusDevice"])); } set { - this["AlwaysDisconnectVirtualBusDevice"] = value; + this["AlwaysUnPlugVirtualBusDevice"] = value; } } diff --git a/ScpControl/Properties/Settings.settings b/ScpControl/Properties/Settings.settings index f1131a7c..7d34eb13 100644 --- a/ScpControl/Properties/Settings.settings +++ b/ScpControl/Properties/Settings.settings @@ -131,7 +131,7 @@ False - + True diff --git a/ScpControl/RootHub.cs b/ScpControl/RootHub.cs index 939b01f7..5e4fefd4 100644 --- a/ScpControl/RootHub.cs +++ b/ScpControl/RootHub.cs @@ -595,7 +595,7 @@ protected override void OnHidReportReceived(object sender, ScpHidReport e) _vibration[serial][0] = _vibration[serial][1] = 0; _mNative[serial][0] = _mNative[serial][1] = 0; - if (GlobalConfiguration.Instance.AlwaysDisconnectVirtualBusDevice) + if (GlobalConfiguration.Instance.AlwaysUnPlugVirtualBusDevice) { _scpBus.Unplug(_scpBus.IndexToSerial((byte)e.PadId)); } diff --git a/ScpControl/ScpControl.csproj b/ScpControl/ScpControl.csproj index 806dea36..7ea2dd2c 100644 --- a/ScpControl/ScpControl.csproj +++ b/ScpControl/ScpControl.csproj @@ -23,7 +23,7 @@ AssemblyVersionAttribute - 1.7.275.16101 + 1.7.276.16101 true diff --git a/ScpControl/ScpCore/GlobalConfiguration.cs b/ScpControl/ScpCore/GlobalConfiguration.cs index ae7fc0d1..dc839bfb 100644 --- a/ScpControl/ScpCore/GlobalConfiguration.cs +++ b/ScpControl/ScpCore/GlobalConfiguration.cs @@ -245,10 +245,10 @@ public bool IsVBusDisabled set { Settings.Default.IsVBusDisabled = value; } } - public bool AlwaysDisconnectVirtualBusDevice + public bool AlwaysUnPlugVirtualBusDevice { - get { return Settings.Default.AlwaysDisconnectVirtualBusDevice; } - set { Settings.Default.AlwaysDisconnectVirtualBusDevice = value; } + get { return Settings.Default.AlwaysUnPlugVirtualBusDevice; } + set { Settings.Default.AlwaysUnPlugVirtualBusDevice = value; } } public bool ReservePadSlot diff --git a/ScpControl/app.config b/ScpControl/app.config index e3213619..9cd79f55 100644 --- a/ScpControl/app.config +++ b/ScpControl/app.config @@ -144,7 +144,7 @@ False - + True diff --git a/ScpDebugInfoCollector/Properties/CommonInfo.cs b/ScpDebugInfoCollector/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpDebugInfoCollector/Properties/CommonInfo.cs +++ b/ScpDebugInfoCollector/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpDriverInstaller/Properties/CommonInfo.cs b/ScpDriverInstaller/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpDriverInstaller/Properties/CommonInfo.cs +++ b/ScpDriverInstaller/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpGamepadAnalyzer/Properties/CommonInfo.cs b/ScpGamepadAnalyzer/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpGamepadAnalyzer/Properties/CommonInfo.cs +++ b/ScpGamepadAnalyzer/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpMonitor/Properties/CommonInfo.cs b/ScpMonitor/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpMonitor/Properties/CommonInfo.cs +++ b/ScpMonitor/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpPair/Properties/CommonInfo.cs b/ScpPair/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpPair/Properties/CommonInfo.cs +++ b/ScpPair/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpProfiler/Properties/CommonInfo.cs b/ScpProfiler/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpProfiler/Properties/CommonInfo.cs +++ b/ScpProfiler/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpServer/Properties/CommonInfo.cs b/ScpServer/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpServer/Properties/CommonInfo.cs +++ b/ScpServer/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpService/Properties/CommonInfo.cs b/ScpService/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpService/Properties/CommonInfo.cs +++ b/ScpService/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpSettings/MainWindow.xaml b/ScpSettings/MainWindow.xaml index 5ff91145..761a1eb0 100644 --- a/ScpSettings/MainWindow.xaml +++ b/ScpSettings/MainWindow.xaml @@ -362,7 +362,7 @@ Grid.Row="0" Margin="0,0,0,10"> - By checking one or more of the checkboxes below the service will check you device drivers on every start-up and re-applies the correct driver on your Bluetooth dongle or Usb-wired DualShock controllers to ensure proper communication with the software. + By checking one or more of the check-boxes below the service will check you device drivers on every start-up and re-applies the correct driver on your Bluetooth dongle or Usb-wired DualShock controllers to ensure proper communication with the software. Force Bluetooth driver installation Force DualShock 3 driver installation @@ -378,11 +378,11 @@ Disable Virtual Bus events - The default behavior of the virtual Xbox 360 controller device created by the virtual bus is to linger in a connected state even if the physical gamepad gets disconnected (turned off). If you'd like the virtual Xbox 360 controller to "disconnect" from the system when the physical pad gets shut off, tick the box below. + The default behavior of the virtual Xbox 360 controller device created by the virtual bus is to linger in a connected state even if the physical game-pad gets disconnected (turned off). If you'd like the virtual Xbox 360 controller to "disconnect" from the system when the physical pad gets shut off, tick the box below. - Always unplug virtual controller + Always unplug virtual controller - Reserves the slot of the controller to its MAC address if enabled. Usefull if you have a DualShock-only environment and want a fixed slot index for your pad. + Reserves the slot of the controller to its MAC address if enabled. Useful if you have a DualShock-only environment and want a fixed slot index for your pad. Reserve controller slot diff --git a/ScpSettings/Properties/CommonInfo.cs b/ScpSettings/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpSettings/Properties/CommonInfo.cs +++ b/ScpSettings/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file diff --git a/ScpXInputBridge/Properties/CommonInfo.cs b/ScpXInputBridge/Properties/CommonInfo.cs index c2a7af9b..0825cdef 100644 --- a/ScpXInputBridge/Properties/CommonInfo.cs +++ b/ScpXInputBridge/Properties/CommonInfo.cs @@ -11,5 +11,5 @@ [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.7.275.16101")] -[assembly: AssemblyFileVersion("1.7.275.16101")] \ No newline at end of file +[assembly: AssemblyVersion("1.7.276.16101")] +[assembly: AssemblyFileVersion("1.7.276.16101")] \ No newline at end of file