diff --git a/.gitignore b/.gitignore
index f6ccc5c..b179d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,5 @@ __pycache__/
/BetterJoyForCemu/FodyWeavers.xsd
/title.png
/title.pdn
+/Drivers
+/! Install the drivers in the Drivers folder
diff --git a/BetterJoy.sln b/BetterJoy.sln
index 27a8acd..9419b72 100644
--- a/BetterJoy.sln
+++ b/BetterJoy.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.852
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30002.166
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterJoy", "BetterJoyForCemu\BetterJoy.csproj", "{1BF709E9-C133-41DF-933A-C9FF3F664C7B}"
EndProject
@@ -21,8 +21,7 @@ Global
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x64.Build.0 = Debug|x64
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x86.ActiveCfg = Debug|x86
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x86.Build.0 = Debug|x86
- {1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.ActiveCfg = Release|x86
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x64.ActiveCfg = Release|x64
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x64.Build.0 = Release|x64
{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x86.ActiveCfg = Release|x86
diff --git a/BetterJoyForCemu/! Install the drivers in the Drivers folder b/BetterJoyForCemu/! Install the drivers in the Drivers folder
new file mode 100644
index 0000000..e69de29
diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index e14e2c2..b8aa817 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -68,6 +68,6 @@
-
+
\ No newline at end of file
diff --git a/BetterJoyForCemu/BetterJoy.csproj b/BetterJoyForCemu/BetterJoy.csproj
index c41e23a..f80161f 100644
--- a/BetterJoyForCemu/BetterJoy.csproj
+++ b/BetterJoyForCemu/BetterJoy.csproj
@@ -32,25 +32,6 @@
true
true
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
true
bin\x86\Debug\
@@ -65,7 +46,7 @@
bin\x86\Release\
TRACE
true
- pdbonly
+ none
x86
prompt
MinimumRecommendedRules.ruleset
@@ -85,7 +66,7 @@
bin\x64\Release\
TRACE
true
- pdbonly
+ none
x64
prompt
MinimumRecommendedRules.ruleset
@@ -179,6 +160,9 @@
+
+ Always
+
Designer
@@ -186,6 +170,12 @@
+
+ Always
+
+
+ Always
+
diff --git a/BetterJoyForCemu/Drivers/README.txt b/BetterJoyForCemu/Drivers/README.txt
new file mode 100644
index 0000000..88f8089
--- /dev/null
+++ b/BetterJoyForCemu/Drivers/README.txt
@@ -0,0 +1,7 @@
+Driver installer provided for convenience.
+
+Latest ViGEmBus releases are here: https://github.com/ViGEm/ViGEmBus/releases
+
+If you're on Win7, please read the instructions on the page.
+
+HidGuardian is not provided by default anymore because it was buggy and caused a lot of users a lot of headaches because they didn't know what to do with it. If you require the drivers for it, look at older BetterJoy releases.
\ No newline at end of file
diff --git a/BetterJoyForCemu/Drivers/ViGEmBus_Setup_1.16.116.exe b/BetterJoyForCemu/Drivers/ViGEmBus_Setup_1.16.116.exe
new file mode 100644
index 0000000..fc907e0
Binary files /dev/null and b/BetterJoyForCemu/Drivers/ViGEmBus_Setup_1.16.116.exe differ
diff --git a/BetterJoyForCemu/Reassign.Designer.cs b/BetterJoyForCemu/Reassign.Designer.cs
index 1ac2fc4..e5e2e48 100644
--- a/BetterJoyForCemu/Reassign.Designer.cs
+++ b/BetterJoyForCemu/Reassign.Designer.cs
@@ -93,8 +93,8 @@ namespace BetterJoyForCemu {
this.btn_sl_r = new BetterJoyForCemu.SplitButton();
this.lbl_sr_r = new System.Windows.Forms.Label();
this.btn_sr_r = new BetterJoyForCemu.SplitButton();
- this.btn_close = new BetterJoyForCemu.SplitButton();
- this.btn_apply = new BetterJoyForCemu.SplitButton();
+ this.btn_close = new Button();
+ this.btn_apply = new Button();
this.tip_reassign = new System.Windows.Forms.ToolTip(this.components);
this.lbl_reset_mouse = new System.Windows.Forms.Label();
this.btn_reset_mouse = new BetterJoyForCemu.SplitButton();
@@ -316,8 +316,8 @@ namespace BetterJoyForCemu {
private SplitButton btn_sl_r;
private System.Windows.Forms.Label lbl_sr_r;
private SplitButton btn_sr_r;
- private SplitButton btn_close;
- private SplitButton btn_apply;
+ private Button btn_close;
+ private Button btn_apply;
private System.Windows.Forms.ToolTip tip_reassign;
private System.Windows.Forms.Label lbl_reset_mouse;
private SplitButton btn_reset_mouse;