Emulation/EmuDeck
1
0
Fork 0
mirror of https://github.com/dragoonDorise/EmuDeck.git synced 2024-05-20 13:17:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse source
This commit is contained in:
Dragoon Dorise 2024-04-15 11:03:26 +02:00
parent 1675e44821 a524757cf8
commit aad71b3fe3
9 changed files with 43 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/mame/mame.ini
View file

@ -2,7 +2,7 @@
# CORE CONFIGURATION OPTIONS
#
readconfig 1
writeconfig 1
writeconfig 0
#
# CORE SEARCH PATH OPTIONS
@ -17,7 +17,7 @@ inipath $HOME/.mame/ini;/app/share/mame/ini
fontpath /app/bin/
cheatpath $HOME/.mame/cheat;/app/share/mame/cheat
crosshairpath /app/share/mame/crosshair
pluginspath /app/share/mame/plugins
pluginspath $HOME/.mame/plugins;/app/share/mame/plugins
languagepath /app/share/mame/language
swpath /app/share/mame/software

2
configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/Wiimote/Wii_base_nunchuck_with_touchpad.ini
View file

@ -1,6 +1,6 @@
[Profile]
Device = SDL/0/Steam Virtual Gamepad
Buttons/A = `Button S`|`Thumb R`
Buttons/A = `Button S`|`Thumb R`|`XInput2/0/Virtual core pointer:Click 1`
Buttons/B = `Button E`
Buttons/1 = `Button N`
Buttons/2 = `Button W`

2
configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/Wiimote/Wii_no_attachment_with_touchpad.ini
View file

@ -1,6 +1,6 @@
[Profile]
Device = SDL/0/Steam Virtual Gamepad
Buttons/A = `Button S`|`Thumb R`
Buttons/A = `Button S`|`Thumb R`|`XInput2/0/Virtual core pointer:Click 1`
Buttons/B = `Button E`
Buttons/1 = `Button N`
Buttons/2 = `Button W`

8
configs/org.flycast.Flycast/config/flycast/mappings/SDL_controller_neptune.cfg
View file

@ -13,10 +13,9 @@ bind9 = 5+:btn_trigger_right
[digital]
bind0 = 0:btn_a
bind1 = 1:btn_b
bind10 = 256:btn_dpad1_up
bind11 = 257:btn_dpad1_down
bind12 = 258:btn_dpad1_left
bind13 = 259:btn_dpad1_right
bind10 = 257:btn_dpad1_down
bind11 = 258:btn_dpad1_left
bind12 = 259:btn_dpad1_right
bind2 = 2:btn_x
bind3 = 3:btn_y
bind4 = 4:btn_z
@ -24,6 +23,7 @@ bind5 = 5:btn_c
bind6 = 6:btn_menu
bind7 = 7:btn_start
bind8 = 8:btn_dpad2_up
bind9 = 256:btn_dpad1_up
[emulator]
dead_zone = 10

3
configs/pcsx2qt/.config/PCSX2/inis/PCSX2.ini
View file

@ -11,6 +11,7 @@ RenderToSeparateWindow = false
HideMainWindowWhenRunning = false
DisableWindowResize = false
Theme = darkfusion
SetupWizardIncomplete = false
[EmuCore]
@ -489,4 +490,4 @@ LargeMotor = SDL-1/LargeMotor
SmallMotor = SDL-1/SmallMotor
[GameList]
RecursivePaths = /run/media/mmcblk0p1/Emulation/roms/ps2
RecursivePaths = /run/media/mmcblk0p1/Emulation/roms/ps2

2
configs/pegasus-frontend/game_dirs.txt
View file

@ -1,5 +1,4 @@
/run/media/mmcblk0p1/Emulation/roms/3do
/run/media/mmcblk0p1/Emulation/roms/3ds
/run/media/mmcblk0p1/Emulation/roms/64dd
/run/media/mmcblk0p1/Emulation/roms/ags
/run/media/mmcblk0p1/Emulation/roms/amiga
@ -58,7 +57,6 @@
/run/media/mmcblk0p1/Emulation/roms/fmtowns
/run/media/mmcblk0p1/Emulation/roms/gameandwatch
/run/media/mmcblk0p1/Emulation/roms/gamecom
/run/media/mmcblk0p1/Emulation/roms/gamecube
/run/media/mmcblk0p1/Emulation/roms/gamegear
/run/media/mmcblk0p1/Emulation/roms/gb
/run/media/mmcblk0p1/Emulation/roms/gba

28
functions/EmuScripts/emuDeckMAME.sh
View file

@ -30,6 +30,22 @@ MAME_init(){
#SRM_createParsers
MAME_flushEmulatorLauncher
MAME_addSteamInputProfile
# If writeconfig is set to 1 in mame.ini, these files get created. Back up on reset so users can get the default/EmuDeck configured mame.ini file in ~/.mame
# writeconfig is disabled by default. Was enabled by default for a short time.
if [ -f "$storagePath/mame/ini/mame.ini" ]; then
mv "$storagePath/mame/ini/mame.ini" "$storagePath/mame/ini/mame.ini.bak"
fi
if [ -f "$storagePath/mame/ini/ui.ini" ]; then
mv "$storagePath/mame/ini/ui.ini" "$storagePath/mame/ini/ui.ini.bak"
fi
if [ -f "$HOME/.mame/ini/mame.ini" ]; then
mv "$HOME/.mame/ini/mame.ini" "$HOME/.mame/ini/mame.ini.bak"
fi
if [ -f "$HOME/.mame/ini/ui.ini" ]; then
mv "$HOME/.mame/ini/ui.ini" "$HOME/.mame/ini/ui.ini.bak"
fi
}
#update
@ -65,11 +81,14 @@ MAME_setEmulationFolder(){
newinipathOpt="$inipathOpt""$storagePath/mame/ini;"'$HOME/.mame/ini;$HOME/.mame;/app/share/mame/ini'
changeLine "$inipathOpt" "$newinipathOpt" "$MAME_configFile"
cheatpathOpt='cheatpath '
newcheatpathOpt="$cheatpathOpt""$storagePath/mame/cheat;"'$HOME/.mame/cheat;/app/share/mame/cheat'
changeLine "$cheatpathOpt" "$newcheatpathOpt" "$MAME_configFile"
pluginspathOpt='pluginspath '
newpluginspathOpt="$pluginspathOpt""$storagePath/mame/plugins;"'$HOME/.mame/plugins;/app/share/mame/plugins'
changeLine "$pluginspathOpt" "$newpluginspathOpt" "$MAME_configFile"
}
#SetupSaves
@ -95,7 +114,14 @@ MAME_setupStorage(){
mkdir -p "$storagePath/mame/ctrlr"
mkdir -p "$storagePath/mame/ini"
mkdir -p "$storagePath/mame/cheat"
mkdir -p "$storagePath/mame/plugins"
mkdir -p "$HOME/.mame/samples"
mkdir -p "$HOME/.mame/artwork"
mkdir -p "$HOME/.mame/ctrlr"
mkdir -p "$HOME/.mame/ini"
mkdir -p "$HOME/.mame/cheat"
mkdir -p "$HOME/.mame/plugins"
}

3
functions/EmuScripts/emuDeckPCSX2QT.sh
View file

@ -68,6 +68,7 @@ PCSX2QT_setEmulationFolder() {
setMSG "Setting $PCSX2QT_emuName Emulation Folder"
iniFieldUpdate "$PCSX2QT_configFile" "UI" "ConfirmShutdown" "false"
iniFieldUpdate "$PCSX2QT_configFile" "UI" "SetupWizardIncomplete" "false"
iniFieldUpdate "$PCSX2QT_configFile" "Folders" "Bios" "${biosPath}"
iniFieldUpdate "$PCSX2QT_configFile" "Folders" "Snapshots" "${storagePath}/pcsx2/snaps"
iniFieldUpdate "$PCSX2QT_configFile" "Folders" "Savestates" "${savesPath}/pcsx2/states"
@ -339,4 +340,4 @@ PCSX2QT_flushEmulatorLauncher(){
flushEmulatorLaunchers "pcsx2-qt"
}
}

4
uninstall.sh
View file

@ -287,6 +287,10 @@ fi
if [[ "$doUninstallCitra" == true ]]; then
flatpak uninstall org.citra_emu.citra -y
rm -rf $HOME/.var/app/org.citra_emu.citra &> /dev/null
rm -rf $HOME/.local/share/applications/Citra.desktop &> /dev/null
rm -rf $HOME/Applications/citra-qt*.AppImage &> /dev/null
rm -rf $HOME/.local/share/citra-emu &> /dev/null
rm -rf $HOME/.config/citra-emu &> /dev/null
fi
if [[ "$doUninstallDolphin" == true ]]; then
flatpak uninstall org.DolphinEmu.dolphin-emu -y