Permalink
Browse files

Version 1.4.4

Revised shift modifier: each button/control has their own independent
shift trigger instead of one universal one
Select an action window: this window now highlights what said control is
currently set to.
Removed unused images, making the exe a meg smaller
Completely revised how the code for custom mapping works
Updated all translations, added partial Dutch/Nederlands Support
  • Loading branch information...
1 parent fa639ba commit 93936cf311b208261ef023d7600795251a2fb037 @Jays2Kings committed Dec 18, 2015
Showing with 18,791 additions and 132,844 deletions.
  1. +6 −6 DS4Windows/DS4Control/ControlSerivce.cs
  2. +3 −44 DS4Windows/DS4Control/DS4LightBar.cs
  3. +615 −824 DS4Windows/DS4Control/Mapping.cs
  4. +4 −16 DS4Windows/DS4Control/Mouse.cs
  5. +533 −191 DS4Windows/DS4Control/ScpUtil.cs
  6. +139 −50 DS4Windows/DS4Forms/DS4Form.Designer.cs
  7. +3 −6,431 DS4Windows/DS4Forms/DS4Form.ar.resx
  8. +3 −4 DS4Windows/DS4Forms/DS4Form.cs
  9. +52 −6,471 DS4Windows/DS4Forms/DS4Form.de-DE.resx
  10. +23 −6,433 DS4Windows/DS4Forms/DS4Form.es.resx
  11. +3 −6,452 DS4Windows/DS4Forms/DS4Form.fr-FR.resx
  12. +0 −6,431 DS4Windows/DS4Forms/DS4Form.he.resx
  13. +0 −6,431 DS4Windows/DS4Forms/DS4Form.it-IT.resx
  14. +613 −0 DS4Windows/DS4Forms/DS4Form.nl.resx
  15. +12 −6,431 DS4Windows/DS4Forms/DS4Form.pl.resx
  16. +11 −6,433 DS4Windows/DS4Forms/DS4Form.pt-BR.resx
  17. +2,323 −8,505 DS4Windows/DS4Forms/DS4Form.resx
  18. +9 −259 DS4Windows/DS4Forms/DS4Form.ro-RO.resx
  19. +108 −367 DS4Windows/DS4Forms/DS4Form.ru-RU.resx
  20. +6 −259 DS4Windows/DS4Forms/DS4Form.tr.resx
  21. +0 −6,618 DS4Windows/DS4Forms/DS4Form.tzm-Arab.resx
  22. +18 −265 DS4Windows/DS4Forms/DS4Form.vi.resx
  23. +0 −259 DS4Windows/DS4Forms/DS4Form.zh-Hans.resx
  24. +0 −259 DS4Windows/DS4Forms/DS4Form.zh-Hant.resx
  25. +129 −0 DS4Windows/DS4Forms/DupBox.nl.resx
  26. +6 −0 DS4Windows/DS4Forms/Hotkeys.de-DE.resx
  27. +7 −1 DS4Windows/DS4Forms/Hotkeys.es.resx
  28. +4 −1 DS4Windows/DS4Forms/Hotkeys.fr-FR.resx
  29. +157 −0 DS4Windows/DS4Forms/Hotkeys.nl.resx
  30. +4 −1 DS4Windows/DS4Forms/Hotkeys.vi.resx
  31. +492 −281 DS4Windows/DS4Forms/KBM360.Designer.cs
  32. +4 −1 DS4Windows/DS4Forms/KBM360.ar.resx
  33. +314 −131 DS4Windows/DS4Forms/KBM360.cs
  34. +12 −3,573 DS4Windows/DS4Forms/KBM360.de-DE.resx
  35. +26 −3,558 DS4Windows/DS4Forms/KBM360.es.resx
  36. +25 −3,552 DS4Windows/DS4Forms/KBM360.fr-FR.resx
  37. +4 −3,559 DS4Windows/DS4Forms/KBM360.he.resx
  38. +11 −3,562 DS4Windows/DS4Forms/KBM360.it-IT.resx
  39. +183 −0 DS4Windows/DS4Forms/KBM360.nl.resx
  40. +34 −3,570 DS4Windows/DS4Forms/KBM360.pl.resx
  41. +6 −3,551 DS4Windows/DS4Forms/KBM360.pt-BR.resx
  42. +4,086 −7,318 DS4Windows/DS4Forms/KBM360.resx
  43. +17 −3,561 DS4Windows/DS4Forms/KBM360.ro-RO.resx
  44. +8 −3,622 DS4Windows/DS4Forms/KBM360.ru-RU.resx
  45. +10 −3,560 DS4Windows/DS4Forms/KBM360.tr.resx
  46. +20 −3,549 DS4Windows/DS4Forms/KBM360.vi.resx
  47. +0 −3,585 DS4Windows/DS4Forms/KBM360.zh-Hans.resx
  48. +4 −3,543 DS4Windows/DS4Forms/KBM360.zh-Hant.resx
  49. +610 −1,578 DS4Windows/DS4Forms/Options.Designer.cs
  50. +2 −2 DS4Windows/DS4Forms/Options.ar.resx
  51. +268 −722 DS4Windows/DS4Forms/Options.cs
  52. +33 −0 DS4Windows/DS4Forms/Options.de-DE.resx
  53. +56 −3 DS4Windows/DS4Forms/Options.es.resx
  54. +26 −12 DS4Windows/DS4Forms/Options.fr-FR.resx
  55. +6 −0 DS4Windows/DS4Forms/Options.he.resx
  56. +255 −0 DS4Windows/DS4Forms/Options.nl.resx
  57. +30 −0 DS4Windows/DS4Forms/Options.pt-BR.resx
  58. +6,256 −6,766 DS4Windows/DS4Forms/Options.resx
  59. +32 −4 DS4Windows/DS4Forms/Options.ro-RO.resx
  60. +13 −7 DS4Windows/DS4Forms/Options.ru-RU.resx
  61. +18 −0 DS4Windows/DS4Forms/Options.tr.resx
  62. +34 −1 DS4Windows/DS4Forms/Options.vi.resx
  63. +3 −0 DS4Windows/DS4Forms/Options.zh-Hant.resx
  64. +120 −0 DS4Windows/DS4Forms/RecordBox.nl.resx
  65. +120 −0 DS4Windows/DS4Forms/SaveWhere.nl.resx
  66. +34 −1 DS4Windows/DS4Forms/SpecActions.es.resx
  67. +120 −0 DS4Windows/DS4Forms/SpecActions.nl.resx
  68. +5 −2 DS4Windows/DS4Forms/WelcomeDialog.es.resx
  69. +120 −0 DS4Windows/DS4Forms/WelcomeDialog.nl.resx
  70. +4 −1 DS4Windows/DS4Forms/WinProgs.ar.resx
  71. +120 −0 DS4Windows/DS4Forms/WinProgs.nl.resx
  72. +33 −13 DS4Windows/DS4Windows.csproj
  73. +1 −1 DS4Windows/Program.cs
  74. +2 −2 DS4Windows/Properties/AssemblyInfo.cs
  75. +12 −52 DS4Windows/Properties/Resources.Designer.cs
  76. +10 −10 DS4Windows/Properties/Resources.ar.resx
  77. +50 −32 DS4Windows/Properties/Resources.es.resx
  78. +33 −30 DS4Windows/Properties/Resources.fr-FR.resx
  79. +120 −0 DS4Windows/Properties/Resources.nl.resx
  80. +12 −24 DS4Windows/Properties/Resources.resx
  81. +30 −30 DS4Windows/Properties/Resources.ro-RO.resx
  82. +7 −1 DS4Windows/Properties/Resources.ru-RU.resx
  83. +31 −31 DS4Windows/Properties/Resources.tr.resx
  84. +118 −1 DS4Windows/Properties/Resources.vi.resx
  85. BIN DS4Windows/Resources/1401402547_menu-24.png
  86. BIN DS4Windows/Resources/360 fades.png
  87. BIN DS4Windows/Resources/360 highlight.png
  88. BIN DS4Windows/Resources/360 highlight.psd
  89. BIN DS4Windows/Resources/360 map.png
  90. BIN DS4Windows/Resources/360LS.png
  91. BIN DS4Windows/Resources/360RS.png
  92. BIN DS4Windows/Resources/LeftTouch.png
  93. BIN DS4Windows/Resources/MultiTouch.png
  94. BIN DS4Windows/Resources/RightTouch.png
  95. BIN DS4Windows/Resources/Touch states2.png
  96. BIN DS4Windows/Resources/Touch.png
  97. BIN DS4Windows/Resources/sticks.png
  98. BIN DS4Windows/Resources/sticks2.png
@@ -479,13 +479,13 @@ protected virtual void On_Report(object sender, EventArgs e)
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))
+ HasCustomAction(ind) || HasCustomExtras(ind) || ProfileActions[ind].Count > 0))
{
Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind], touchPad[ind], this);
cState = MappedState[ind];
}
- if (getHasCustomExtras(ind))
- DoExtras(ind);
+ //if (HasCustomExtras(ind))
+ // DoExtras(ind);
// Update the GUI/whatever.
DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind], touchPad[ind]);
@@ -534,7 +534,7 @@ public void LagFlashWarning(int ind, bool on)
}
}
- private void DoExtras(int ind)
+ /* private void DoExtras(int ind)
{
DS4State cState = CurrentState[ind];
DS4StateExposed eState = ExposedState[ind];
@@ -589,8 +589,8 @@ private void DoExtras(int ind)
setRumble(0, 0, ind);
held[ind] = false;
}
- }
-
+ }*/
+
public void EasterTime(int ind)
@@ -34,11 +34,7 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
DS4Color color;
if (!defualtLight && !forcelight[deviceNum])
{
- if (ShiftColorOn[deviceNum] && ShiftModifier[deviceNum] > 0 && shiftMod(device, deviceNum, cState, eState, tp))
- {
- color = ShiftColor[deviceNum];
- }
- else if (UseCustomLed[deviceNum])
+ if (UseCustomLed[deviceNum])
{
if (LedAsBatteryIndicator[deviceNum])
{
@@ -140,9 +136,7 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
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];
+ color = ChargingColor[deviceNum];
break;
default:
break;
@@ -214,42 +208,7 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
}
public static bool defualtLight = false, shuttingdown = false;
-
- public static bool shiftMod(DS4Device device, int deviceNum, DS4State cState, DS4StateExposed eState, Mouse tp)
- {
- bool shift;
- switch (ShiftModifier[deviceNum])
- {
- case 1: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Cross, cState, eState, tp); break;
- case 2: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Circle, cState, eState, tp); break;
- case 3: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Square, cState, eState, tp); break;
- case 4: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Triangle, cState, eState, tp); break;
- case 5: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Options, cState, eState, tp); break;
- case 6: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.Share, cState, eState, tp); break;
- case 7: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.DpadUp, cState, eState, tp); break;
- case 8: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.DpadDown, cState, eState, tp); break;
- case 9: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.DpadLeft, cState, eState, tp); break;
- case 10: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.DpadRight, cState, eState, tp); break;
- case 11: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.PS, cState, eState, tp); break;
- case 12: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.L1, cState, eState, tp); break;
- case 13: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.R1, cState, eState, tp); break;
- case 14: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.L2, cState, eState, tp); break;
- case 15: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.R2, cState, eState, tp); break;
- case 16: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.L3, cState, eState, tp); break;
- case 17: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.R3, cState, eState, tp); break;
- case 18: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.TouchLeft, cState, eState, tp); break;
- case 19: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.TouchUpper, cState, eState, tp); break;
- case 20: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.TouchMulti, cState, eState, tp); break;
- case 21: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.TouchRight, cState, eState, tp); break;
- case 22: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.GyroZNeg, cState, eState, tp); break;
- case 23: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.GyroZPos, cState, eState, tp); break;
- case 24: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.GyroXPos, cState, eState, tp); break;
- case 25: shift = Mapping.getBoolMapping(deviceNum, DS4Controls.GyroXNeg, cState, eState, tp); break;
- case 26: shift = device.getCurrentState().Touch1; break;
- default: shift = false; break;
- }
- return shift;
- }
+
public static DS4Color HuetoRGB(float hue, byte sat)
{
byte C = sat;
Oops, something went wrong.

0 comments on commit 93936cf

Please sign in to comment.