mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-11-26 11:04:21 +01:00
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
This commit is contained in:
commit
17b4d74f7e
@ -4568,7 +4568,7 @@ namespace DS4Windows
|
|||||||
gyroMouseHorizontalAxis[device] = 0;
|
gyroMouseHorizontalAxis[device] = 0;
|
||||||
squStickInfo[device].lsMode = false;
|
squStickInfo[device].lsMode = false;
|
||||||
squStickInfo[device].rsMode = false;
|
squStickInfo[device].rsMode = false;
|
||||||
squStickInfo[device].roundness = 5;
|
squStickInfo[device].roundness = 5.0;
|
||||||
setLsOutCurveMode(device, 0);
|
setLsOutCurveMode(device, 0);
|
||||||
setRsOutCurveMode(device, 0);
|
setRsOutCurveMode(device, 0);
|
||||||
setL2OutCurveMode(device, 0);
|
setL2OutCurveMode(device, 0);
|
||||||
|
5
DS4Windows/DS4Forms/Options.Designer.cs
generated
5
DS4Windows/DS4Forms/Options.Designer.cs
generated
@ -3431,6 +3431,11 @@
|
|||||||
0,
|
0,
|
||||||
0});
|
0});
|
||||||
this.RoundnessNUpDown.Name = "RoundnessNUpDown";
|
this.RoundnessNUpDown.Name = "RoundnessNUpDown";
|
||||||
|
this.RoundnessNUpDown.Value = new decimal(new int[] {
|
||||||
|
50,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
65536});
|
||||||
this.RoundnessNUpDown.ValueChanged += new System.EventHandler(this.RoundnessNUpDown_ValueChanged);
|
this.RoundnessNUpDown.ValueChanged += new System.EventHandler(this.RoundnessNUpDown_ValueChanged);
|
||||||
//
|
//
|
||||||
// label28
|
// label28
|
||||||
|
@ -903,6 +903,7 @@ namespace DS4Windows.Forms
|
|||||||
|
|
||||||
lsSquStickCk.Checked = false;
|
lsSquStickCk.Checked = false;
|
||||||
rsSquStickCk.Checked = false;
|
rsSquStickCk.Checked = false;
|
||||||
|
RoundnessNUpDown.Value = 5.0m;
|
||||||
|
|
||||||
cBLaunchProgram.Checked = false;
|
cBLaunchProgram.Checked = false;
|
||||||
pBProgram.Image = null;
|
pBProgram.Image = null;
|
||||||
@ -944,6 +945,9 @@ namespace DS4Windows.Forms
|
|||||||
OutContTypeCb.SelectedIndex = 0;
|
OutContTypeCb.SelectedIndex = 0;
|
||||||
|
|
||||||
gyroOutputMode.SelectedIndex = 0;
|
gyroOutputMode.SelectedIndex = 0;
|
||||||
|
pnlSAMouse.Visible = false;
|
||||||
|
fLPTiltControls.Visible = true;
|
||||||
|
gyroMouseJoyFLP.Visible = false;
|
||||||
gyroMStickTrigBehaveCk.Checked = true;
|
gyroMStickTrigBehaveCk.Checked = true;
|
||||||
gyroMouseStickEvalCombo.SelectedIndex = 0;
|
gyroMouseStickEvalCombo.SelectedIndex = 0;
|
||||||
gyroMouseStickDZ.Value = 30;
|
gyroMouseStickDZ.Value = 30;
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 290 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 290 KiB |
@ -2,6 +2,7 @@ Travis Nickles (Ryochan7)
|
|||||||
carloshbcabral
|
carloshbcabral
|
||||||
Korney Czukowski (czukowski)
|
Korney Czukowski (czukowski)
|
||||||
DandelionSprout
|
DandelionSprout
|
||||||
|
Geroyuni
|
||||||
jdfeng
|
jdfeng
|
||||||
justalemon
|
justalemon
|
||||||
Kamilczak020
|
Kamilczak020
|
||||||
|
Loading…
Reference in New Issue
Block a user