Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dragoonDorise
dragoonDorise committed Dec 18, 2022
2 parents 6039143 + 50a89df commit 414a004
Show file tree
Hide file tree
Showing 45 changed files with 2,143 additions and 4,689 deletions.
372 changes: 0 additions & 372 deletions EmuDeck_shell.ps1
View file

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ We try to use the same hotkeys for every emulator but some of them have their ow
| Menu | L3 + R3 | - | - | - | - | - | - |
| Exit | Select + Start | Select + Start | R5 | Select + Start | Select + Start | STEAM Button | STEAM Button |
| Pause/Unpause Emulation | Select + A | Select + A | - | - | Select + A | | - |
| Fast Forward | Select + R2 | Select + R2 | - | - | Select + R2 | Select + R4 | - |
| Fast Forward | Select + R2 | Select + R2 | - | - | Select + R2 | Select + R2 | - |
| Load State | Select + L1 | Select + L1 | - | - | - | Select + L1 | - |
| Save State | Select + R1 | Select + R1 | - | - | - | Select + R1 | - |
| Full Screen | - | - | L4 | - | - | - | - |
Expand Down
38 changes: 17 additions & 21 deletions configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/GCPadNew.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 10
Triggers/Threshold = 98.0
[GCPad2]
Device = evdev/0/Microsoft X-Box 360 pad 1
Buttons/A = EAST
Buttons/B = SOUTH
Buttons/X = WEST
Buttons/Y = NORTH
Buttons/A = SOUTH
Buttons/B = EAST
Buttons/X = NORTH
Buttons/Y = WEST
Buttons/Z = TR
Buttons/Start = START
Main Stick/Up = `Axis 1-`
Expand All @@ -51,7 +51,6 @@ C-Stick/Left = `Axis 3-`
C-Stick/Right = `Axis 3+`
C-Stick/Modifier = `Ctrl`
C-Stick/Modifier/Range = 50.0
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/L = `Full Axis 2+`
Triggers/R = `Full Axis 5+`
D-Pad/Up = `Axis 7-`
Expand All @@ -61,18 +60,15 @@ D-Pad/Right = `Axis 6+`
Triggers/L-Analog = `Full Axis 2+`
Triggers/R-Analog = `Full Axis 5+`
Rumble/Motor = Strong
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/Threshold = 98.0
[GCPad3]
Device = evdev/1/Wireless Controller
Device = evdev/0/Microsoft X-Box 360 pad 2
Buttons/A = EAST
Buttons/B = C
Buttons/X = SOUTH
Buttons/B = SOUTH
Buttons/X = WEST
Buttons/Y = NORTH
Buttons/Z = `Full Axis 3+`
Buttons/Start = `TR2`
Buttons/A = SOUTH
Buttons/B = EAST
Buttons/X = NORTH
Buttons/Y = WEST
Buttons/Z = TR
Buttons/Start = START
Main Stick/Up = `Axis 1-`
Expand All @@ -88,23 +84,23 @@ C-Stick/Left = `Axis 3-`
C-Stick/Right = `Axis 3+`
C-Stick/Modifier = `Ctrl`
C-Stick/Modifier/Range = 50.0
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/L = TL
Triggers/R = TR
Triggers/L = `Full Axis 2+`
Triggers/R = `Full Axis 5+`
D-Pad/Up = `Axis 7-`
D-Pad/Down = `Axis 7+`
D-Pad/Left = `Axis 6-`
D-Pad/Right = `Axis 6+`
Triggers/L-Analog = `Full Axis 2+`
Triggers/R-Analog = `Full Axis 5+`
Rumble/Motor = Strong
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/Threshold = 98.0
[GCPad4]
Device = evdev/0/Microsoft X-Box 360 pad 3
Buttons/A = EAST
Buttons/B = SOUTH
Buttons/X = WEST
Buttons/Y = NORTH
Buttons/A = SOUTH
Buttons/B = EAST
Buttons/X = NORTH
Buttons/Y = WEST
Buttons/Z = TR
Buttons/Start = START
Main Stick/Up = `Axis 1-`
Expand All @@ -120,7 +116,6 @@ C-Stick/Left = `Axis 3-`
C-Stick/Right = `Axis 3+`
C-Stick/Modifier = `Ctrl`
C-Stick/Modifier/Range = 50.0
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/L = `Full Axis 2+`
Triggers/R = `Full Axis 5+`
D-Pad/Up = `Axis 7-`
Expand All @@ -130,4 +125,5 @@ D-Pad/Right = `Axis 6+`
Triggers/L-Analog = `Full Axis 2+`
Triggers/R-Analog = `Full Axis 5+`
Rumble/Motor = Strong
C-Stick/Calibration = 100.00 101.96 108.24 112.25 112.76 111.88 108.24 101.96 100.00 98.55 97.64 100.59 107.99 110.64 108.24 101.96 100.00 101.96 106.57 115.58 118.40 116.73 108.24 101.96 100.00 101.96 105.64 105.39 107.99 111.37 107.46 101.96
Triggers/Threshold = 98.0
24 changes: 12 additions & 12 deletions configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/WiimoteNew.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ IR/Vertical Offset = 12.0
IR/Total Yaw = 19.0
IR/Total Pitch = 22.0
IR/Auto-Hide = True
IR/Up = `Axis 4-`
IR/Down = `Axis 4+`
IR/Left = `Axis 3-`
IR/Right = `Axis 3+`
IR/Up = `XInput2/0/Virtual core pointer:Cursor Y-`|`Axis 4-`
IR/Down = `XInput2/0/Virtual core pointer:Cursor Y+`|`Axis 4+`
IR/Left = `XInput2/0/Virtual core pointer:Cursor X-`|`Axis 3-`
IR/Right = `XInput2/0/Virtual core pointer:Cursor X+`|`Axis 3+`
IR/Hide = THUMBR
IR/Calibration = 100.00 101.96 108.24 112.67 116.44 114.62 108.11 101.96 100.00 101.96 108.11 113.10 115.81 113.90 108.24 101.96 100.00 101.96 108.24 114.93 115.13 115.19 108.24 101.96 100.00 101.96 108.13 112.88 112.20 110.97 108.24 101.96
Tilt/Forward = `Full Axis 2+`&`Full Axis 1-`
Expand Down Expand Up @@ -189,10 +189,10 @@ IR/Vertical Offset = 12.0
IR/Total Yaw = 19.0
IR/Total Pitch = 22.0
IR/Auto-Hide = True
IR/Up = `Axis 4-`
IR/Down = `Axis 4+`
IR/Left = `Axis 3-`
IR/Right = `Axis 3+`
IR/Up = `XInput2/0/Virtual core pointer:Cursor Y-`|`Axis 4-`
IR/Down = `XInput2/0/Virtual core pointer:Cursor Y+`|`Axis 4+`
IR/Left = `XInput2/0/Virtual core pointer:Cursor X-`|`Axis 3-`
IR/Right = `XInput2/0/Virtual core pointer:Cursor X+`|`Axis 3+`
IR/Hide = THUMBR
IR/Calibration = 100.00 101.96 108.24 112.67 116.44 114.62 108.11 101.96 100.00 101.96 108.11 113.10 115.81 113.90 108.24 101.96 100.00 101.96 108.24 114.93 115.13 115.19 108.24 101.96 100.00 101.96 108.13 112.88 112.20 110.97 108.24 101.96
Tilt/Forward = `Full Axis 2+`&`Full Axis 1-`
Expand Down Expand Up @@ -278,10 +278,10 @@ IR/Vertical Offset = 12.0
IR/Total Yaw = 19.0
IR/Total Pitch = 22.0
IR/Auto-Hide = True
IR/Up = `Axis 4-`
IR/Down = `Axis 4+`
IR/Left = `Axis 3-`
IR/Right = `Axis 3+`
IR/Up = `XInput2/0/Virtual core pointer:Cursor Y-`|`Axis 4-`
IR/Down = `XInput2/0/Virtual core pointer:Cursor Y+`|`Axis 4+`
IR/Left = `XInput2/0/Virtual core pointer:Cursor X-`|`Axis 3-`
IR/Right = `XInput2/0/Virtual core pointer:Cursor X+`|`Axis 3+`
IR/Hide = THUMBR
IR/Calibration = 100.00 101.96 108.24 112.67 116.44 114.62 108.11 101.96 100.00 101.96 108.11 113.10 115.81 113.90 108.24 101.96 100.00 101.96 108.24 114.93 115.13 115.19 108.24 101.96 100.00 101.96 108.13 112.88 112.20 110.97 108.24 101.96
Tilt/Forward = `Full Axis 2+`&`Full Axis 1-`
Expand Down
Loading

0 comments on commit 414a004

Please sign in to comment.