Travis Nickles
|
0397bec557
|
Merge branch 'jay-bezierCurveOutput' of https://github.com/mika-n/DS4Windows into mika-n-jay-bezierCurveOutput
|
2019-08-06 22:00:33 -05:00 |
|
mika-n
|
e85bfc5fde
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay-bezierCurveOutput
|
2019-07-30 15:00:19 +03:00 |
|
Travis Nickles
|
207aecf34a
|
Version 1.7.14
|
2019-07-30 04:37:20 -05:00 |
|
Travis Nickles
|
24052cc7c8
|
Updated newest file
|
2019-07-30 04:37:02 -05:00 |
|
Travis Nickles
|
0b6cb77108
|
Increased wakeup delay. Use custom flow on wakeup
|
2019-07-30 04:28:55 -05:00 |
|
mika-n
|
229dfe5525
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay-bezierCurveOutput
|
2019-07-29 11:31:30 +03:00 |
|
Travis Nickles
|
aa0124970a
|
No longer use quiet mode for ViGEm installer
|
2019-07-29 02:37:53 -05:00 |
|
Travis Nickles
|
628eedd5f1
|
Version 1.7.13
|
2019-07-29 02:01:33 -05:00 |
|
Travis Nickles
|
6990821b1a
|
Updated newest file
|
2019-07-29 02:01:20 -05:00 |
|
Travis Nickles
|
7e18f0d45c
|
Minor tweak
|
2019-07-29 01:13:43 -05:00 |
|
Travis Nickles
|
1f66d984cd
|
Seems to best fix issues with suspending. The delay is MS fault
Related to issue #730
|
2019-07-28 21:53:41 -05:00 |
|
mika-n
|
f59dce057a
|
UseDInputOnly mode supports VJoy output axis of steering wheel emulation mode. VJoy output works even without virtual xbox360 or dualshock4 devices.
|
2019-07-27 23:34:38 +03:00 |
|
mika-n
|
f85e0d413a
|
Pre-defined output curves initialized using a pre-fixed formula. Now only the "Custom" output curve goes through bezier curve logic, but at runtime all output curve options are mapped using a lookup table (better performance and easier code maintenance).
|
2019-07-27 22:23:48 +03:00 |
|
Travis Nickles
|
af9557e53b
|
Disable control service button while a routine is active
|
2019-07-26 03:41:38 -05:00 |
|
Travis Nickles
|
0630719ffc
|
Fixed some strings in pt-BR resx files
Related to issue #757
|
2019-07-26 03:21:51 -05:00 |
|
Travis Nickles
|
4ffda750f7
|
Use old routines for preset curves
|
2019-07-25 14:54:39 -05:00 |
|
mika-n
|
13150015f0
|
Custom curve GUI tweaks.
|
2019-07-19 01:49:22 +03:00 |
|
mika-n
|
acc1b3f952
|
Fixed placement and alignment of couple checkbox options in "Other" settings block. Certain checkbox objects didn't align well (left align) and placement of options was not logical.
|
2019-07-18 00:24:05 +03:00 |
|
mika-n
|
5339a5aa9c
|
Fixed the image size issue in "run program with profile" app icon (didn't zoom the image correctly)
|
2019-07-18 00:11:29 +03:00 |
|
mika-n
|
8a96f92c3c
|
finnish language tweaks
|
2019-07-17 23:53:20 +03:00 |
|
mika-n
|
3c6b927e1a
|
merge
|
2019-07-17 23:33:39 +03:00 |
|
mika-n
|
d4905227c4
|
Custom output curve GUI changes (new edit field in Output curve tab page) and clickable HTML link to open the custom curve web app editor.
|
2019-07-17 23:20:38 +03:00 |
|
mika-n
|
5ebe213526
|
small tweaks to comments and cleanups
|
2019-07-15 17:10:53 +03:00 |
|
mika-n
|
7bb8d02c38
|
Changed EnhancedPrecision output curve option to use the original hard-coded axis ranges (as it was in V1.7.12 and earlier versions). However, mapping for this old curve goes through a lookup table nowadays as with true bezier curves.
|
2019-07-15 16:08:31 +03:00 |
|
mika-n
|
7015a4d1b9
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay-bezierCurveOutput
|
2019-07-14 22:31:53 +03:00 |
|
mika-n
|
1be6ad2973
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-14 20:30:31 +03:00 |
|
Travis Nickles
|
f00a42bedd
|
Slow down mouse wheel scrolling for analog stick
|
2019-07-14 02:29:38 -05:00 |
|
mika-n
|
5207d7dee8
|
small idx fix to saving an auto-profile entry in cases where new window title is empty.
|
2019-07-12 00:32:24 +03:00 |
|
mika-n
|
08779ba1cd
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-12 00:01:13 +03:00 |
|
mika-n
|
e9d9e9f428
|
Support auto-profile matching using both program path and application window title values. Support wildchar string match logic in auto-profile path and window title values. Re-wrote auto-profile checking thread to be less RAM hungry and better performance (caching to remember the previous application and window handle values)
|
2019-07-11 23:58:03 +03:00 |
|
Travis Nickles
|
1eac0f9dd5
|
Should fix updater not getting invoked for version checker
Related to issue #751
|
2019-07-08 00:32:31 -05:00 |
|
mika-n
|
22866d6a5c
|
New customizable output curve functionality. User can create any kind of output curve via a bezier curve editor (external HTML web app in BezierCurveEditor folder).
|
2019-07-07 00:47:54 +03:00 |
|
Travis Nickles
|
9ff137ae92
|
Version 1.7.12
|
2019-07-06 03:12:15 -05:00 |
|
Travis Nickles
|
3efb0fdc42
|
Updated newest file
|
2019-07-06 03:12:03 -05:00 |
|
Travis Nickles
|
268d8d5541
|
Add wait period while suspending
|
2019-07-05 15:22:57 -05:00 |
|
mika-n
|
19a96973ff
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-03 00:11:12 +03:00 |
|
mika-n
|
c6daa18032
|
Changed IPC communication to use memory mapped memory instead of physical file to store the name of the DS4Form window class.
|
2019-07-03 00:02:29 +03:00 |
|
Travis Nickles
|
8e55e7178b
|
Make sure profile name is searched by an exact match
Fixes issue with profile selections when using
similar names
|
2019-07-02 15:41:29 -05:00 |
|
mika-n
|
75d08fe76c
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-02 11:44:15 +03:00 |
|
Travis Nickles
|
1c869647ab
|
Use pre-allocated buffer in UDP server
|
2019-07-02 02:06:32 -05:00 |
|
mika-n
|
7061a5c6c4
|
Tweaked inter-process message posting (added safety checks to ignore too large data packets). Added LogDebug message when a profile is loaded via cmdline commands.
|
2019-07-01 13:34:36 +03:00 |
|
mika-n
|
3817b2e026
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-01 10:53:07 +03:00 |
|
Travis Nickles
|
827fe7c507
|
Removed outdated fille references
|
2019-07-01 00:02:45 -05:00 |
|
Travis Nickles
|
dfaecd474f
|
Group trigger mod profile properties
|
2019-06-30 20:59:51 -05:00 |
|
mika-n
|
1c67d6145e
|
Added cmdline options to send start/stop/shutdown/LoadProfile/LoadTempProfile commands to a background DS4Win app via IPC messaging interface.
|
2019-07-01 02:45:55 +03:00 |
|
Travis Nickles
|
a6ed8240df
|
Group together stick zone modifiers
|
2019-06-30 00:40:24 -05:00 |
|
Travis Nickles
|
a09b06cb28
|
Take Color Dialog out of KB360 form
Form can now be designed in x64 mode
|
2019-06-29 21:36:54 -05:00 |
|
Travis Nickles
|
7db29d115b
|
Add necessary tag to resx file
|
2019-06-29 18:16:55 -05:00 |
|
Imre Kristoffer Eilertsen
|
bb738569e2
|
Update DS4Form.nb.resx
|
2019-06-27 01:27:33 +02:00 |
|
Imre Kristoffer Eilertsen
|
2dad207222
|
Update DS4Windows.csproj
|
2019-06-27 01:24:30 +02:00 |
|
Imre Kristoffer Eilertsen
|
59509ab13d
|
Update Hotkeys.resx
|
2019-06-27 01:21:08 +02:00 |
|
Imre Kristoffer Eilertsen
|
4fdb76759c
|
Update Resources.nb.resx
|
2019-06-27 01:17:07 +02:00 |
|
Imre Kristoffer Eilertsen
|
be0177d4ef
|
Update DS4Form.nb.resx
|
2019-06-27 01:11:53 +02:00 |
|
Imre Kristoffer Eilertsen
|
536151379c
|
Create Hotkeys.nb.resx
|
2019-06-27 01:09:43 +02:00 |
|
Imre Kristoffer Eilertsen
|
c5644ddcf2
|
Update WelcomeDialog.nb.resx
|
2019-06-27 00:51:47 +02:00 |
|
Imre Kristoffer Eilertsen
|
006d21ca8b
|
Create WinProgs.nb.resx
|
2019-06-27 00:47:37 +02:00 |
|
Imre Kristoffer Eilertsen
|
42173a6ced
|
Update Options.nb.resx
|
2019-06-27 00:41:42 +02:00 |
|
Imre Kristoffer Eilertsen
|
0593b485ec
|
Update DS4Form.nb.resx
|
2019-06-27 00:35:14 +02:00 |
|
Travis Nickles
|
934947e3dc
|
Lowered enhanced precision curves
|
2019-06-26 17:20:49 -05:00 |
|
Travis Nickles
|
157bb67951
|
Group square stick profile properties into a class
|
2019-06-26 01:35:41 -05:00 |
|
Kamilczak020
|
4b901b3489
|
Implemented square stick roundness selectability
|
2019-06-25 23:42:08 +02:00 |
|
Travis Nickles
|
5d9546f5bd
|
Version 1.7.11
|
2019-06-24 16:20:30 -05:00 |
|
Travis Nickles
|
cb5a466b5d
|
Updated newest file
|
2019-06-24 16:20:17 -05:00 |
|
Travis Nickles
|
1b769a0e4f
|
Remove unused lang from assembly copying
|
2019-06-24 16:12:09 -05:00 |
|
Travis Nickles
|
988d576879
|
Added new translation files to project file
|
2019-06-23 01:18:01 -05:00 |
|
Travis Nickles
|
6e55d78aaa
|
Merge branch 'jay' of https://github.com/DandelionSprout/DS4Windows into DandelionSprout-jay
|
2019-06-22 19:05:09 -05:00 |
|
Imre Kristoffer Eilertsen
|
cca00d8807
|
Attempted to take care of DS4Windows/DS4Windows.csproj
I caught a cold on Monday afternoon and had to wait until now to do it.
|
2019-06-19 23:07:47 +02:00 |
|
Travis Nickles
|
132dce7845
|
Loosen enhanced precision curves
|
2019-06-18 01:46:51 -05:00 |
|
Travis Nickles
|
3473fe1dc9
|
Removed color dialog dep from design for some forms
Allows using the designer for x64 target for some forms
|
2019-06-17 01:22:39 -05:00 |
|
Imre Kristoffer Eilertsen
|
f3c33bca34
|
Overhaul, part 3/3
|
2019-06-13 13:47:02 +02:00 |
|
Imre Kristoffer Eilertsen
|
e454f0c6bf
|
Overhaul, part 2/~3
|
2019-06-13 13:33:09 +02:00 |
|
Imre Kristoffer Eilertsen
|
4a47893e0c
|
Update Options.nb.resx
|
2019-06-13 13:27:32 +02:00 |
|
Imre Kristoffer Eilertsen
|
33049bef3e
|
Overhaul, part 1/~2
|
2019-06-13 13:25:12 +02:00 |
|
Imre Kristoffer Eilertsen
|
c9e6282bd2
|
Update Resources.nb.resx
|
2019-06-10 11:34:20 +02:00 |
|
Imre Kristoffer Eilertsen
|
a931ae162d
|
Update WelcomeDialog.nb.resx
|
2019-06-10 11:31:59 +02:00 |
|
Imre Kristoffer Eilertsen
|
95c9212d6a
|
Update WelcomeDialog.nb.resx
|
2019-06-10 11:29:44 +02:00 |
|
Imre Kristoffer Eilertsen
|
4b08d0b306
|
Update SpecActions.nb.resx
|
2019-06-10 11:28:01 +02:00 |
|
Imre Kristoffer Eilertsen
|
338383d4a9
|
Update SaveWhere.nb.resx
|
2019-06-10 11:24:40 +02:00 |
|
Imre Kristoffer Eilertsen
|
c3a712cb58
|
Update Options.nb.resx
|
2019-06-10 11:22:37 +02:00 |
|
Imre Kristoffer Eilertsen
|
b5646c6ef6
|
Update DupBox.nb.resx
|
2019-06-10 11:16:13 +02:00 |
|
Imre Kristoffer Eilertsen
|
b07b4ce89f
|
What could possibly go wrong with this new approach?
Apart from just about everything?
|
2019-06-10 11:13:28 +02:00 |
|
Travis Nickles
|
ddb4ca96ba
|
Added easeout cubic curve option
|
2019-06-09 02:15:00 -05:00 |
|
Travis Nickles
|
eace87229e
|
Version 1.7.10
|
2019-06-08 01:19:42 -05:00 |
|
Travis Nickles
|
d193e8ba28
|
Updated newest file
|
2019-06-08 01:18:42 -05:00 |
|
Travis Nickles
|
50187fe9c1
|
Take user control out of design mode. Fixes design view on my end.
LanguagePackComboBox in DS4Form has caused massive issues in VS
2017 and 2019 since the clean Windows install
|
2019-06-04 02:19:19 -05:00 |
|
Imre Kristoffer Eilertsen
|
c2faa0e0da
|
Create DupBox.nb.resx
|
2019-06-04 00:32:09 +02:00 |
|
Imre Kristoffer Eilertsen
|
df7a36d252
|
Create DS4Form.nb.resx
|
2019-06-04 00:30:49 +02:00 |
|
Imre Kristoffer Eilertsen
|
7598fc48f3
|
Create Options.nb.resx
|
2019-06-02 18:03:14 +02:00 |
|
Imre Kristoffer Eilertsen
|
ee842b2098
|
Create SaveWhere.nb.resx
|
2019-06-02 17:39:03 +02:00 |
|
Imre Kristoffer Eilertsen
|
9655675401
|
Create SpecActions.nb.resx
|
2019-06-02 17:35:57 +02:00 |
|
Imre Kristoffer Eilertsen
|
331e5939ea
|
Create WelcomeDialog.nb.resx
|
2019-06-02 17:29:51 +02:00 |
|
Imre Kristoffer Eilertsen
|
6785524941
|
Norwegian Bokmål translation, part 1/?
|
2019-06-02 17:21:23 +02:00 |
|
Travis Nickles
|
c7b45b7dcc
|
Use leave event rather than text changed event
|
2019-05-30 17:52:25 -05:00 |
|
mika-n
|
c64ebc6c9f
|
Support for Warrior Joypad JS083 gamepad. See issue #713 for more details.
|
2019-05-28 21:58:40 +03:00 |
|
mika-n
|
93bd802dc1
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-05-28 12:24:44 +03:00 |
|
Travis Nickles
|
aa3d907b2a
|
Monitor process rather than search for process name
|
2019-05-28 00:50:50 -05:00 |
|
Travis Nickles
|
60c137138d
|
Minor window title parse tweak
Change to monitor process id later
|
2019-05-28 00:26:27 -05:00 |
|
mika-n
|
444a75a938
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-05-27 11:21:27 +03:00 |
|
Travis Nickles
|
ea39a8a755
|
Version 1.7.9
|
2019-05-27 02:58:31 -05:00 |
|
Travis Nickles
|
86e4714b08
|
Updated newest file
|
2019-05-27 02:58:14 -05:00 |
|
mika-n
|
5767a1866d
|
UPD listen host address or IP number option in UDP server settings. By default UDP server listens onlhy 127.0.0.1 loopback interface, so connections work only within a host computer. This new UDPServerListenAddress option allows to use specific IP or 0.0.0.0 (=all interfaces) as listen address to enable remote UDP connections.
|
2019-05-27 01:07:17 +03:00 |
|
Travis Nickles
|
ba9bdf8b42
|
Merge branch 'jay' of https://github.com/carloshbcabral/DS4Windows into carloshbcabral-jay
|
2019-05-19 20:12:25 -05:00 |
|
Travis Nickles
|
b29626330d
|
Merge branch 'jay' of https://github.com/mika-n/DS4Windows into mika-n-jay
|
2019-05-19 19:58:41 -05:00 |
|
Travis Nickles
|
db5c08722b
|
Added hovertext message for touchpad toggle
|
2019-05-19 19:54:11 -05:00 |
|
mika-n
|
fb0ba669df
|
Support for Razer Raiju Ultimate (USB wired connection only at the moment). #689. VID/PID provided by Neodraon and Voovoodoo.
Support for CronusMax PS4OutputMode. #702. VID/PID provided by Aidolii.
|
2019-05-17 16:00:03 +03:00 |
|
Travis Nickles
|
fa38d4e315
|
Updated Welcome Dialog to usee ViGEm Installer 1.6.115
|
2019-05-16 22:02:03 -05:00 |
|
Travis Nickles
|
d227e087d9
|
Retrieve ViGEMBus driver version string
|
2019-05-12 00:33:43 -05:00 |
|
mika-n
|
02f66981a7
|
Steering wheel emulation for the new dualshock4 controller option. Fine tuned anti-deadzone calculation for DS4 output controller.
|
2019-05-09 23:21:31 +03:00 |
|
mika-n
|
8a561d1cde
|
Steering wheel emulation for the new dualshock4 controller output option.
|
2019-05-09 21:32:29 +03:00 |
|
Travis Nickles
|
3d89b3786b
|
Close connection to ViGEmBus before opening Driver Setup window
|
2019-05-08 01:11:36 -05:00 |
|
CarlosCabral
|
63e09ebbb8
|
🖼 Optimized Images Part II - The Mission
|
2019-05-07 20:33:53 -03:00 |
|
CarlosCabral
|
01ac5e3584
|
🖼 Optimized Images
|
2019-05-07 19:48:28 -03:00 |
|
FuriaESP
|
f06dedb8c1
|
Merge pull request #1 from Ryochan7/jay
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-05-04 13:10:30 +02:00 |
|
Travis Nickles
|
92e51ebe53
|
Version 1.7.8
|
2019-05-04 01:53:13 -05:00 |
|
Travis Nickles
|
d62d605920
|
Update newest file
|
2019-05-04 01:52:39 -05:00 |
|
FuriaESP
|
6b6cc53c64
|
Replace and add new icons
|
2019-05-04 00:54:15 +02:00 |
|
Travis Nickles
|
e0b1b273fc
|
Minor tweak
|
2019-05-03 17:50:06 -05:00 |
|
Travis Nickles
|
b73f706ec2
|
Enforce default X360 in more places
Related to issue #683
|
2019-05-02 20:18:59 -05:00 |
|
Travis Nickles
|
f01c86deee
|
Move Forms to seperate namespace
|
2019-04-30 14:29:50 -05:00 |
|
Travis Nickles
|
78dcbe666c
|
Added Razer Raiju Tournament Edition support
Related to issue #580
|
2019-04-29 22:17:15 -05:00 |
|
Travis Nickles
|
f4c05533fc
|
Migrate status of TouchButton
Related to issue #670
|
2019-04-29 21:26:24 -05:00 |
|
Travis Nickles
|
20c05d45b6
|
Version 1.7.7
|
2019-04-29 02:30:43 -05:00 |
|
Travis Nickles
|
2a0338ac7e
|
Updated newest file
|
2019-04-29 02:30:22 -05:00 |
|
Travis Nickles
|
8797892103
|
Finally add a note about Visual C++ 2017 in app
|
2019-04-29 01:30:08 -05:00 |
|
Travis Nickles
|
90045f7f50
|
Fixed Up-Left DPad direction for DS4 output device
|
2019-04-28 22:05:54 -05:00 |
|
Travis Nickles
|
7ff7fb10d1
|
Version 1.7.6
|
2019-04-27 02:51:54 -05:00 |
|
Travis Nickles
|
fd0a3107b3
|
Updated newest file
|
2019-04-27 02:51:34 -05:00 |
|
Travis Nickles
|
f9f72b1f4a
|
Added hover text for output controller option
|
2019-04-25 21:21:24 -05:00 |
|
Travis Nickles
|
544a284ec3
|
Updated ViGEmClient library to use notification queue for DS4 target
|
2019-04-24 16:20:29 -05:00 |
|
Travis Nickles
|
9ffe0daa78
|
Merge branch 'jay' into ds4emulate
|
2019-04-24 03:19:58 -05:00 |
|
Travis Nickles
|
62258a3711
|
Link delegates to class instance rather than linking to interface
A decent boost
|
2019-04-24 03:19:06 -05:00 |
|
Travis Nickles
|
49165a4bac
|
Change another unplug message
|
2019-04-24 01:36:36 -05:00 |
|
Travis Nickles
|
8a6c05bce7
|
Added device type strings to output devices
|
2019-04-23 21:53:41 -05:00 |
|
Travis Nickles
|
ab8dbd29f9
|
Merge branch 'jay' into ds4emulate
|
2019-04-23 21:07:19 -05:00 |
|
Travis Nickles
|
5da3db4b2a
|
Merge branch 'jay' of https://github.com/mika-n/DS4Windows into mika-n-jay
|
2019-04-23 20:43:39 -05:00 |
|
Travis Nickles
|
206e1649cf
|
Merge branch 'jay' into ds4emulate
|
2019-04-23 14:44:17 -05:00 |
|
Travis Nickles
|
0cce1db3a9
|
Reset some gyro mouse flags as a safeguard when changing toggle
|
2019-04-23 14:43:45 -05:00 |
|
mika-n
|
b09e5c277e
|
Added "Unload on regular trigger release" checkbox option to "SpecialAction.Profiles" edit panel. This option can be used to automatically unload a profile (ie. goes back to previous profile) when a regular trigger key is released.
|
2019-04-23 14:54:04 +03:00 |
|
mika-n
|
456145cf8e
|
Fixed a bug described in #664 issue where gyro mouse doesn't get correct properties (for example toggle option) right after Startup or Hotplug LoadProfile calls. The mouse object was created after LoadProfile function even when LoadProfile function tries to set few properties of that mouse object.
|
2019-04-23 12:32:12 +03:00 |
|
mika-n
|
4f87d24ee3
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-04-23 10:43:14 +03:00 |
|
mika-n
|
c168dabded
|
ActionLoadProfile: Support for automatically untriggered (=unloaded) profiles when a regular action keys are released. LoadProfile special action has a new "automatically unload when a regular trigger released" option. This is sort of like "shift modifier for the whole profile" functionality.
|
2019-04-23 03:39:44 +03:00 |
|
Travis Nickles
|
27fc7f07a2
|
Merge branch 'jay' into ds4emulate
|
2019-04-22 18:54:15 -05:00 |
|
Travis Nickles
|
ee5ff50e79
|
Changed ViGEm Bus Driver check
Related to issue #667
|
2019-04-22 18:51:21 -05:00 |
|
Travis Nickles
|
ec1e03a52c
|
Merge branch 'jay' into ds4emulate
|
2019-04-22 17:28:50 -05:00 |
|
Travis Nickles
|
38e6b0e2e1
|
Link to newer ViGEmBus installer
|
2019-04-22 17:26:51 -05:00 |
|
Travis Nickles
|
d59cc370db
|
Merge branch 'jay' into ds4emulate
|
2019-04-21 22:49:43 -05:00 |
|
Travis Nickles
|
5ae0c1ea5c
|
Check for newer ViGEmBus device
|
2019-04-21 21:40:29 -05:00 |
|
Travis Nickles
|
19b2112b54
|
Fixed botched merge conflict
|
2019-04-21 02:24:36 -05:00 |
|
Travis Nickles
|
6c72566e36
|
Merge branch 'jay' into ds4emulate
# Conflicts:
# DS4Windows/DS4Forms/Options.resx
|
2019-04-21 02:07:28 -05:00 |
|
Travis Nickles
|
e0513f3f06
|
Removed extra config loading section
Should not be needed in WinProgs. Config will be
loaded by this point
|
2019-04-21 01:54:56 -05:00 |
|