Permalink
Browse files

Version 1.4.32

Added Sensitivity settings for both sticks, triggers, and the gyro
Fixed the select an action window popping up after closing the profile
settings or in another tab
Fixed the lightbar button on the main tab being so long, along with some
other random ui fixes
Fixed many issues with making a new profile
When using a custom color the light now fades out based on the current
profile settings (ie. when the battery is low)
Added Hebrew and Vietnamese translations
Updated Chinese (T), Russian, German, Polish
  • Loading branch information...
1 parent 2846a03 commit b528f3ec61488c0ea40a4b365c7eb122181b0872 @Jays2Kings committed Dec 5, 2015
Showing with 50,710 additions and 11,318 deletions.
  1. +2 −1 DS4Windows/DS4Control/ControlSerivce.cs
  2. +61 −51 DS4Windows/DS4Control/DS4LightBar.cs
  3. +130 −106 DS4Windows/DS4Control/Mapping.cs
  4. +29 −3 DS4Windows/DS4Control/ScpUtil.cs
  5. +8 −8 DS4Windows/DS4Forms/DS4Form.cs
  6. +67 −42 DS4Windows/DS4Forms/DS4Form.de-DE.resx
  7. +7,068 −0 DS4Windows/DS4Forms/DS4Form.he.resx
  8. +27 −31 DS4Windows/DS4Forms/DS4Form.pl.resx
  9. +31 −27 DS4Windows/DS4Forms/DS4Form.pt-BR.resx
  10. +585 −588 DS4Windows/DS4Forms/DS4Form.resx
  11. +133 −106 DS4Windows/DS4Forms/DS4Form.ru-RU.resx
  12. +6,618 −0 DS4Windows/DS4Forms/DS4Form.tzm-Arab.resx
  13. +7,041 −0 DS4Windows/DS4Forms/DS4Form.vi.resx
  14. +6,855 −117 DS4Windows/DS4Forms/DS4Form.zh-Hant.resx
  15. +167 −0 DS4Windows/DS4Forms/DupBox.he.resx
  16. +5 −2 DS4Windows/DS4Forms/DupBox.resx
  17. +40 −2 DS4Windows/DS4Forms/DupBox.tr.resx
  18. +129 −0 DS4Windows/DS4Forms/DupBox.vi.resx
  19. +16 −0 DS4Windows/DS4Forms/Hotkeys.Designer.cs
  20. +7 −8 DS4Windows/DS4Forms/Hotkeys.cs
  21. +71 −23 DS4Windows/DS4Forms/Hotkeys.de-DE.resx
  22. +151 −0 DS4Windows/DS4Forms/Hotkeys.he.resx
  23. +224 −158 DS4Windows/DS4Forms/Hotkeys.resx
  24. +35 −11 DS4Windows/DS4Forms/Hotkeys.ru-RU.resx
  25. +163 −0 DS4Windows/DS4Forms/Hotkeys.vi.resx
  26. +22 −9 DS4Windows/DS4Forms/Hotkeys.zh-Hant.resx
  27. +15 −10 DS4Windows/DS4Forms/KBM360.de-DE.resx
  28. +3,760 −0 DS4Windows/DS4Forms/KBM360.he.resx
  29. +30 −6 DS4Windows/DS4Forms/KBM360.pl.resx
  30. +696 −696 DS4Windows/DS4Forms/KBM360.resx
  31. +10 −9 DS4Windows/DS4Forms/KBM360.ru-RU.resx
  32. +3,744 −0 DS4Windows/DS4Forms/KBM360.vi.resx
  33. +624 −328 DS4Windows/DS4Forms/Options.Designer.cs
  34. +170 −284 DS4Windows/DS4Forms/Options.cs
  35. +152 −40 DS4Windows/DS4Forms/Options.de-DE.resx
  36. +484 −0 DS4Windows/DS4Forms/Options.he.resx
  37. +6 −0 DS4Windows/DS4Forms/Options.pl.resx
  38. +6,579 −7,806 DS4Windows/DS4Forms/Options.resx
  39. +267 −87 DS4Windows/DS4Forms/Options.ru-RU.resx
  40. +681 −0 DS4Windows/DS4Forms/Options.vi.resx
  41. +182 −67 DS4Windows/DS4Forms/Options.zh-Hant.resx
  42. +24 −23 DS4Windows/DS4Forms/RecordBox.Designer.cs
  43. +8 −2 DS4Windows/DS4Forms/RecordBox.de-DE.resx
  44. +247 −0 DS4Windows/DS4Forms/RecordBox.he.resx
  45. +515 −455 DS4Windows/DS4Forms/RecordBox.resx
  46. +6 −0 DS4Windows/DS4Forms/RecordBox.ru-RU.resx
  47. +174 −0 DS4Windows/DS4Forms/RecordBox.vi.resx
  48. +3 −0 DS4Windows/DS4Forms/RecordBox.zh-Hant.resx
  49. +1 −1 DS4Windows/DS4Forms/SaveWhere.de-DE.resx
  50. +138 −0 DS4Windows/DS4Forms/SaveWhere.he.resx
  51. +141 −0 DS4Windows/DS4Forms/SaveWhere.vi.resx
  52. +10 −1 DS4Windows/DS4Forms/SpecActions.de-DE.resx
  53. +183 −0 DS4Windows/DS4Forms/SpecActions.he.resx
  54. +5 −2 DS4Windows/DS4Forms/SpecActions.pl.resx
  55. +10 −1 DS4Windows/DS4Forms/SpecActions.ru-RU.resx
  56. +171 −0 DS4Windows/DS4Forms/SpecActions.vi.resx
  57. +10 −1 DS4Windows/DS4Forms/SpecActions.zh-Hant.resx
  58. +18 −1 DS4Windows/DS4Forms/WelcomeDialog.cs
  59. +262 −0 DS4Windows/DS4Forms/WelcomeDialog.he.resx
  60. +15 −8 DS4Windows/DS4Forms/WelcomeDialog.pl.resx
  61. +25 −22 DS4Windows/DS4Forms/WelcomeDialog.resx
  62. +73 −16 DS4Windows/DS4Forms/WelcomeDialog.ru-RU.resx
  63. +111 −10 DS4Windows/DS4Forms/WelcomeDialog.tr.resx
  64. +120 −0 DS4Windows/DS4Forms/WelcomeDialog.vi.resx
  65. +133 −14 DS4Windows/DS4Forms/WelcomeDialog.zh-Hant.resx
  66. +168 −0 DS4Windows/DS4Forms/WinProgs.he.resx
  67. +3 −0 DS4Windows/DS4Forms/WinProgs.pl.resx
  68. +3 −0 DS4Windows/DS4Forms/WinProgs.ru-RU.resx
  69. +120 −0 DS4Windows/DS4Forms/WinProgs.vi.resx
  70. +3 −0 DS4Windows/DS4Forms/WinProgs.zh-Hant.resx
  71. +67 −0 DS4Windows/DS4Windows.csproj
  72. +2 −2 DS4Windows/Program.cs
  73. +2 −2 DS4Windows/Properties/AssemblyInfo.cs
  74. +50 −41 DS4Windows/Properties/Resources.de-DE.resx
  75. +495 −0 DS4Windows/Properties/Resources.he.resx
  76. +85 −25 DS4Windows/Properties/Resources.pl.resx
  77. +44 −32 DS4Windows/Properties/Resources.ru-RU.resx
  78. +120 −0 DS4Windows/Properties/Resources.vi.resx
  79. +60 −33 DS4Windows/Properties/Resources.zh-Hant.resx
@@ -475,7 +475,8 @@ protected virtual void On_Report(object sender, EventArgs e)
EasterTime(ind);
GetInputkeys(ind);
if (LSCurve[ind] != 0 || RSCurve[ind] != 0 || LSDeadzone[ind] != 0 || RSDeadzone[ind] != 0 ||
- L2Deadzone[ind] != 0 || R2Deadzone[ind] != 0) //if a curve or deadzone is in place
+ L2Deadzone[ind] != 0 || R2Deadzone[ind] != 0 || LSSens[ind] != 0 || RSSens[ind] != 0 ||
+ L2Sens[ind] != 0 || R2Sens[ind] != 0) //if a curve or deadzone is in place
cState = Mapping.SetCurveAndDeadzone(ind, cState);
if (!recordingMacro && (!string.IsNullOrEmpty(tempprofilename[ind]) ||
getHasCustomKeysorButtons(ind) || getHasShiftCustomKeysorButtons(ind) || ProfileActions[ind].Count > 0))
@@ -40,7 +40,15 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
}
else if (UseCustomLed[deviceNum])
{
- color = CustomColor[deviceNum];
+ if (LedAsBatteryIndicator[deviceNum])
+ {
+ DS4Color fullColor = CustomColor[deviceNum];
+ DS4Color lowColor = LowColor[deviceNum];
+
+ color = getTransitionedColor(lowColor, fullColor, device.Battery);
+ }
+ else
+ color = CustomColor[deviceNum];
}
else
{
@@ -70,7 +78,7 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
//if (device.Charging == false || device.Battery >= 100) // when charged, don't show the charging animation
{
DS4Color fullColor = MainColor[deviceNum];
- DS4Color lowColor = LowColor[deviceNum];
+ DS4Color lowColor = LowColor[deviceNum];
color = getTransitionedColor(lowColor, fullColor, (uint)device.Battery);
}
@@ -80,63 +88,65 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
color = MainColor[deviceNum];
}
+ }
- if (device.Battery <= FlashAt[deviceNum] && !defualtLight && !device.Charging)
+ if (device.Battery <= FlashAt[deviceNum] && !defualtLight && !device.Charging)
+ {
+ if (!(FlashColor[deviceNum].red == 0 &&
+ FlashColor[deviceNum].green == 0 &&
+ FlashColor[deviceNum].blue == 0))
+ color = FlashColor[deviceNum];
+ if (FlashType[deviceNum] == 1)
{
- if (!(FlashColor[deviceNum].red == 0 &&
- FlashColor[deviceNum].green == 0 &&
- FlashColor[deviceNum].blue == 0))
- color = FlashColor[deviceNum];
- if (FlashType[deviceNum] == 1)
- {
+ if (fadetimer[deviceNum] <= 0)
+ fadedirection[deviceNum] = true;
+ else if (fadetimer[deviceNum] >= 100)
+ fadedirection[deviceNum] = false;
+ if (fadedirection[deviceNum])
+ fadetimer[deviceNum] += 1;
+ else
+ fadetimer[deviceNum] -= 1;
+ color = getTransitionedColor(color, new DS4Color(0, 0, 0), fadetimer[deviceNum]);
+ }
+ }
+
+ if (IdleDisconnectTimeout[deviceNum] > 0 && LedAsBatteryIndicator[deviceNum] && (!device.Charging || device.Battery >= 100))
+ {//Fade lightbar by idle time
+ TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks);
+ double botratio = timeratio.TotalMilliseconds;
+ double topratio = TimeSpan.FromSeconds(IdleDisconnectTimeout[deviceNum]).TotalMilliseconds;
+ double ratio = ((botratio / topratio) * 100);
+ if (ratio >= 50 && ratio <= 100)
+ color = getTransitionedColor(color, new DS4Color(0, 0, 0), (uint)((ratio - 50) * 2));
+ else if (ratio >= 100)
+ color = getTransitionedColor(color, new DS4Color(0, 0, 0), 100);
+ }
+ if (device.Charging && device.Battery < 100)
+ switch (ChargingType[deviceNum])
+ {
+ case 1:
if (fadetimer[deviceNum] <= 0)
fadedirection[deviceNum] = true;
- else if (fadetimer[deviceNum] >= 100)
+ else if (fadetimer[deviceNum] >= 105)
fadedirection[deviceNum] = false;
if (fadedirection[deviceNum])
- fadetimer[deviceNum] += 1;
+ fadetimer[deviceNum] += .1;
else
- fadetimer[deviceNum] -= 1;
- color = getTransitionedColor(color, new DS4Color(0,0,0), fadetimer[deviceNum]);
- }
- }
-
- if (IdleDisconnectTimeout[deviceNum] > 0 && LedAsBatteryIndicator[deviceNum] && (!device.Charging || device.Battery >= 100))
- {//Fade lightbar by idle time
- TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks);
- double botratio = timeratio.TotalMilliseconds;
- double topratio = TimeSpan.FromSeconds(IdleDisconnectTimeout[deviceNum]).TotalMilliseconds;
- double ratio = ((botratio / topratio) * 100);
- if (ratio >= 50 && ratio <= 100)
- color = getTransitionedColor(color, new DS4Color(0, 0, 0), (uint)((ratio - 50) * 2));
- else if (ratio >= 100)
- color = getTransitionedColor(color, new DS4Color(0, 0, 0), 100);
- }
- if (device.Charging && device.Battery < 100)
- switch (ChargingType[deviceNum])
- {
- case 1:
- if (fadetimer[deviceNum] <= 0)
- fadedirection[deviceNum] = true;
- else if (fadetimer[deviceNum] >= 105)
- fadedirection[deviceNum] = false;
- if (fadedirection[deviceNum])
- fadetimer[deviceNum] += .1;
- else
- fadetimer[deviceNum] -= .1;
- color = getTransitionedColor(color, new DS4Color(0, 0, 0), fadetimer[deviceNum]);
- break;
- case 2:
- counters[deviceNum] += .167;
- color = HuetoRGB((float)counters[deviceNum] % 360, 255);
- break;
- case 3:
+ fadetimer[deviceNum] -= .1;
+ color = getTransitionedColor(color, new DS4Color(0, 0, 0), fadetimer[deviceNum]);
+ break;
+ case 2:
+ counters[deviceNum] += .167;
+ color = HuetoRGB((float)counters[deviceNum] % 360, 255);
+ break;
+ case 3:
+ if (!(ShiftColorOn[deviceNum] && ShiftModifier[deviceNum] > 0 && shiftMod(device, deviceNum, cState, eState, tp)) &&
+ !UseCustomLed[deviceNum])
color = ChargingColor[deviceNum];
- break;
- default:
- break;
- }
- }
+ break;
+ default:
+ break;
+ }
}
else if (forcelight[deviceNum])
{
Oops, something went wrong.

0 comments on commit b528f3e

Please sign in to comment.