Merge branch 'main' into dev

# Conflicts:
#	versions.json
This commit is contained in:
Dragoon Dorise 2024-04-19 11:42:20 +02:00
commit 27e3906abc
4 changed files with 58 additions and 39 deletions

View file

@ -1,20 +1,15 @@
[Profile]
Device = evdev/0/Microsoft X-Box 360 pad 0
Buttons/A = `Full Axis 5+`
Buttons/B = SOUTH
Buttons/1 = SELECT
Buttons/2 = START
Buttons/- = TL
Buttons/+ = TR
Buttons/Down = NORTH
D-Pad/Down = NORTH
Tilt/Modifier/Range = 50.000000000000000
IMUIR/Enabled = False
Extension = Nunchuk
Nunchuk/Buttons/C = THUMBL|WEST
Nunchuk/Buttons/Z = `Full Axis 2+`
Nunchuk/Stick/Dead Zone = 10.000000000000000
Nunchuk/Stick/Virtual Notches = 5.0000000000000000
Nunchuk/Stick/Up = `Axis 1-`
Nunchuk/Stick/Down = `Axis 1+`
Nunchuk/Stick/Left = `Axis 0-`
@ -30,15 +25,13 @@ Drums/Stick/Modifier/Range = 50.000000000000000
Turntable/Stick/Modifier/Range = 50.000000000000000
uDraw/Stylus/Modifier/Range = 50.000000000000000
Drawsome/Stylus/Modifier/Range = 50.000000000000000
Rumble/Motor = Strong
PrimeHack/Enable Beam Menu = True
D-Pad/Down = NORTH
PrimeHack/Beam 1 = TR&`Axis 7-`
PrimeHack/Beam 2 = TR&`Axis 6+`
PrimeHack/Beam 3 = TR&`Axis 7+`
PrimeHack/Beam 4 = TR&`Axis 6-`
PrimeHack/Next Beam = `Axis 6+`&!(TL|TR)
PrimeHack/Previous Beam = `Axis 6-`&!(TL|TR)
PrimeHack/Enable Visor Menu = True
PrimeHack/Visor 1 = TL&`Axis 7-`
PrimeHack/Visor 2 = TL&`Axis 6+`
PrimeHack/Visor 3 = TL&`Axis 7+`
@ -46,12 +39,21 @@ PrimeHack/Visor 4 = TL&`Axis 6-`
PrimeHack/Next Visor = `Axis 7-`&!(TL|TR)
PrimeHack/Previous Visor = `Axis 7+`&!(TL|TR)
PrimeHack/MorphBallProfile = livedeht1_morph
Camera Control/Dead Zone = 10.000000000000000
Camera Control/Modifier/Range = 50.000000000000000
PrimeHack/Grapple Lasso = EAST
Source = 3
Buttons/Down = NORTH
PrimeHack/Mode = 1
Camera Control/Up = `Axis 4-`
Camera Control/Down = `Axis 4+`
Camera Control/Left = `Axis 3-`
Camera Control/Right = `Axis 3+`
Camera Control/Modifier/Range = 50.000000000000000
Camera Control/Dead Zone = 10.000000000000000
Nunchuk/Stick/Dead Zone = 10.000000000000000
Rumble/Motor = Strong
PrimeHack/Enable Visor Menu = True
Camera Control/Calibration = 100.00 101.96 108.23 111.79 112.84 115.20 108.24 101.96 100.00 101.96 108.24 111.14 110.70 110.55 108.24 101.96 100.00 101.96 108.24 118.75 119.78 119.67 108.24 101.96 100.00 101.96 108.24 111.53 114.48 114.91 108.13 101.96
PrimeHack/Mode = 1
PrimeHack/Grapple Lasso = EAST
PrimeHack/Enable Beam Menu = True
Nunchuk/Stick/Virtual Notches = 5.0000000000000000
Buttons/B = SOUTH
PrimeHack/AltProfile = livedeht1_morph

View file

@ -1,44 +1,37 @@
[Profile]
Device = evdev/0/Microsoft X-Box 360 pad 0
Buttons/A = `Full Axis 5+`
Buttons/B = EAST
Buttons/1 = SELECT
Buttons/2 = START
Buttons/- = TL
Buttons/+ = TR
Buttons/Down = NORTH
D-Pad/Down = NORTH
Tilt/Modifier/Range = 50.000000000000000
Tilt/Modifier/Range = 50.
IMUIR/Enabled = False
Extension = Nunchuk
Nunchuk/Buttons/C = THUMBL|WEST
Nunchuk/Buttons/Z = `Full Axis 2+`
Nunchuk/Stick/Dead Zone = 10.000000000000000
Nunchuk/Stick/Virtual Notches = 5.0000000000000000
Nunchuk/Stick/Up = `Axis 1-`
Nunchuk/Stick/Down = `Axis 1+`
Nunchuk/Stick/Left = `Axis 0-`
Nunchuk/Stick/Right = `Axis 0+`
Nunchuk/Stick/Modifier/Range = 50.000000000000000
Nunchuk/Stick/Modifier/Range = 50.
Nunchuk/Stick/Calibration = 100.00 101.96 108.24 110.71 112.28 113.66 108.24 101.96 100.00 101.96 107.57 108.29 108.39 107.84 107.65 101.96 100.00 101.96 108.24 114.09 118.05 120.27 108.24 101.96 100.00 101.96 108.24 110.20 110.40 107.81 107.65 101.96
Nunchuk/Tilt/Modifier/Range = 50.000000000000000
Nunchuk/Tilt/Modifier/Range = 50.
Nunchuk/Shake/Y = LSHIFT & (`Axis Y-` | `Axis Y+` | `Axis X-` | `Axis X+`)
Classic/Left Stick/Modifier/Range = 50.000000000000000
Classic/Right Stick/Modifier/Range = 50.000000000000000
Guitar/Stick/Modifier/Range = 50.000000000000000
Drums/Stick/Modifier/Range = 50.000000000000000
Turntable/Stick/Modifier/Range = 50.000000000000000
uDraw/Stylus/Modifier/Range = 50.000000000000000
Drawsome/Stylus/Modifier/Range = 50.000000000000000
Rumble/Motor = Strong
PrimeHack/Enable Beam Menu = True
Classic/Left Stick/Modifier/Range = 50.
Classic/Right Stick/Modifier/Range = 50.
Guitar/Stick/Modifier/Range = 50.
Drums/Stick/Modifier/Range = 50.
Turntable/Stick/Modifier/Range = 50.
uDraw/Stylus/Modifier/Range = 50.
Drawsome/Stylus/Modifier/Range = 50.
D-Pad/Down = NORTH
PrimeHack/Beam 1 = TR&`Axis 7-`
PrimeHack/Beam 2 = TR&`Axis 6+`
PrimeHack/Beam 3 = TR&`Axis 7+`
PrimeHack/Beam 4 = TR&`Axis 6-`
PrimeHack/Next Beam = `Axis 6+`&!(TL|TR)
PrimeHack/Previous Beam = `Axis 6-`&!(TL|TR)
PrimeHack/Enable Visor Menu = True
PrimeHack/Visor 1 = TL&`Axis 7-`
PrimeHack/Visor 2 = TL&`Axis 6+`
PrimeHack/Visor 3 = TL&`Axis 7+`
@ -46,13 +39,22 @@ PrimeHack/Visor 4 = TL&`Axis 6-`
PrimeHack/Next Visor = `Axis 7-`&!(TL|TR)
PrimeHack/Previous Visor = `Axis 7+`&!(TL|TR)
PrimeHack/MorphBallProfile = Disabled
Camera Control/Dead Zone = 10.000000000000000
Camera Control/Modifier/Range = 50.
PrimeHack/Grapple Lasso = `Full Axis 2+`
Source = 3
Buttons/Down = NORTH
PrimeHack/Mode = 1
Camera Control/Up = `Axis 4-`
Camera Control/Down = `Axis 4+`
Camera Control/Left = `Axis 3-`
Camera Control/Right = `Axis 3+`
Camera Control/Modifier/Range = 50.000000000000000
Camera Control/Dead Zone = 10.
Nunchuk/Stick/Dead Zone = 10.
Rumble/Motor = Strong
PrimeHack/Enable Visor Menu = True
Camera Control/Calibration = 100.00 101.96 108.23 111.79 112.84 115.20 108.24 101.96 100.00 101.96 108.24 111.14 110.70 110.55 108.24 101.96 100.00 101.96 108.24 118.75 119.78 119.67 108.24 101.96 100.00 101.96 108.24 111.53 114.48 114.91 108.13 101.96
PrimeHack/Mode = 1
PrimeHack/Enable Beam Menu = True
Nunchuk/Stick/Virtual Notches = 5.
Buttons/B = EAST
PrimeHack/AltProfile = Disabled
PrimeHack/Spring Ball = SOUTH
PrimeHack/Grapple Lasso = `Full Axis 2+`

View file

@ -56,6 +56,7 @@ Camera Control/Calibration = 100.00 101.96 108.23 111.79 112.84 115.20 108.24 10
PrimeHack/Enable Beam Menu = True
Nunchuk/Stick/Virtual Notches = 5.0000000000000000
Buttons/B = SOUTH
PrimeHack/AltProfile = livedeht1_morph
[Wiimote2]
Device = XInput2/0/Virtual core pointer
Tilt/Modifier/Range = 50.000000000000000

View file

@ -46,18 +46,28 @@ pegasus_init(){
find $romsPath -type f -name "metadata.txt" -exec sed -i "s|/run/media/mmcblk0p1/Emulation|${emulationPath}|g" {} \;
if [ -L "$toolsPath/downloaded_media/gamecube" ]; then
rm -rf "$toolsPath/downloaded_media/gamecube" &> /dev/null
fi
if [ -L "$toolsPath/downloaded_media/3ds" ]; then
rm -rf "$toolsPath/downloaded_media/3ds" &> /dev/null
fi
for systemPath in "$romsPath"/*; do
echo $romsPath
echo "$romsPath"
if [[ "$systemPath" == "$romsPath/model2" || "$systemPath" == "$romsPath/xbox360" || "$systemPath" == "$romsPath/wiiu" ]]; then
rm -rf "$systemPath/roms/media" &> /dev/null;
rm -rf "$romsPath/xbox360/roms/xbla/media" &> /dev/null;
rm -rf "$romsPath/xbox360/roms/xbla/metadata.txt" &> /dev/null;
rm -rf "$systemPath/roms/media" &> /dev/null
rm -rf "$romsPath/xbox360/roms/xbla/media" &> /dev/null
rm -rf "$romsPath/xbox360/roms/xbla/metadata.txt" &> /dev/null
elif [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
continue
else
rm -rf "$systemPath/media" &> /dev/null;
rm -rf "$systemPath/media" &> /dev/null
fi
done
for systemPath in "$romsPath"/*; do
if [[ "$systemPath" == "$romsPath/model2" || "$systemPath" == "$romsPath/xbox360" || "$systemPath" == "$romsPath/wiiu" ]]; then
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
@ -68,6 +78,8 @@ pegasus_init(){
rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"
elif [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
continue
else
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
mkdir -p "$toolsPath/downloaded_media/$system/covers"
@ -87,6 +99,8 @@ pegasus_init(){
ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
elif [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
continue
else
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
ln -s "$toolsPath/downloaded_media/$system" "$systemPath/media" &> /dev/null