mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-12-24 23:51:49 +01:00
Merge branch 'jay' into ds4emulate
This commit is contained in:
commit
b23ffcda76
20
DS4Windows/DS4Forms/Hotkeys.Designer.cs
generated
20
DS4Windows/DS4Forms/Hotkeys.Designer.cs
generated
@ -90,6 +90,8 @@
|
||||
this.coinTP = new System.Windows.Forms.TabPage();
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
this.linkPatreon = new System.Windows.Forms.LinkLabel();
|
||||
this.linkSubStar = new System.Windows.Forms.LinkLabel();
|
||||
this.tCAbout.SuspendLayout();
|
||||
this.tPHotkeys.SuspendLayout();
|
||||
this.tPCredits.SuspendLayout();
|
||||
@ -482,6 +484,8 @@
|
||||
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
|
||||
this.flowLayoutPanel1.Controls.Add(this.textBox2);
|
||||
this.flowLayoutPanel1.Controls.Add(this.linkDonate);
|
||||
this.flowLayoutPanel1.Controls.Add(this.linkPatreon);
|
||||
this.flowLayoutPanel1.Controls.Add(this.linkSubStar);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
//
|
||||
// textBox2
|
||||
@ -491,6 +495,20 @@
|
||||
this.textBox2.Name = "textBox2";
|
||||
this.textBox2.ReadOnly = true;
|
||||
//
|
||||
// linkPatreon
|
||||
//
|
||||
resources.ApplyResources(this.linkPatreon, "linkPatreon");
|
||||
this.linkPatreon.Name = "linkPatreon";
|
||||
this.linkPatreon.TabStop = true;
|
||||
this.linkPatreon.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkPatreon_LinkClicked);
|
||||
//
|
||||
// linkSubStar
|
||||
//
|
||||
resources.ApplyResources(this.linkSubStar, "linkSubStar");
|
||||
this.linkSubStar.Name = "linkSubStar";
|
||||
this.linkSubStar.TabStop = true;
|
||||
this.linkSubStar.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkSubStar_LinkClicked);
|
||||
//
|
||||
// Hotkeys
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@ -578,5 +596,7 @@
|
||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
|
||||
private System.Windows.Forms.TextBox textBox2;
|
||||
private System.Windows.Forms.LinkLabel linkCurrentSite;
|
||||
private System.Windows.Forms.LinkLabel linkPatreon;
|
||||
private System.Windows.Forms.LinkLabel linkSubStar;
|
||||
}
|
||||
}
|
@ -111,5 +111,15 @@ namespace DS4Windows
|
||||
{
|
||||
Process.Start("https://ryochan7.github.io/ds4windows-site/");
|
||||
}
|
||||
|
||||
private void LinkPatreon_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
Process.Start("https://patreon.com/user?u=501036");
|
||||
}
|
||||
|
||||
private void LinkSubStar_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
Process.Start("https://subscribestar.com/ryochan7");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
|
||||
// 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("1.7.3")]
|
||||
[assembly: AssemblyFileVersion("1.7.3")]
|
||||
[assembly: AssemblyVersion("1.7.4")]
|
||||
[assembly: AssemblyFileVersion("1.7.4")]
|
||||
[assembly: NeutralResourcesLanguage("en")]
|
||||
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
1.7.3
|
||||
1.7.4
|
||||
|
@ -103,6 +103,11 @@ If you would like to send some coin my way, here are some means by
|
||||
which to do so.
|
||||
|
||||
**PayPal:** https://paypal.me/ryochan7
|
||||
**Patreon:** https://patreon.com/user?u=501036
|
||||
**SubscribeStar:** https://subscribestar.com/ryochan7
|
||||
|
||||
### Crypto
|
||||
|
||||
**Bitcoin:** 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9
|
||||
**Dogecoin:** D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK
|
||||
**Litecoin:** La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6
|
||||
|
11
TODO.md
11
TODO.md
@ -1,11 +1,6 @@
|
||||
# TODO
|
||||
|
||||
* ~~Look into adding periodic rumble updates when data does not change~~
|
||||
* ~~Look into newer version of HidGuardian~~
|
||||
* ~~Look into distributing profile properties around various objects
|
||||
rather than using a lot of getters to obtain properties each poll.
|
||||
It will complicate the architecture a little bit but hopefully
|
||||
any speed difference will make up for it.~~
|
||||
* Remove old welcome dialog and make new driver installer executable.
|
||||
Use newer standards (WPF) and bundle app with DS4Windows
|
||||
* Finalize DS4 Emulation
|
||||
* ~~Remove old welcome dialog and make new driver installer executable.
|
||||
Use newer standards (WPF) and bundle app with DS4Windows~~
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user