mirror of
https://github.com/dragoonDorise/EmuDeck.git
synced 2024-05-20 13:17:55 -04:00
Merge branch 'early-unstable' into early
This commit is contained in:
commit
1278ccecba
|
@ -7,7 +7,7 @@
|
|||
<language>0</language>
|
||||
<use_discord_presence>false</use_discord_presence>
|
||||
<fullscreen_menubar>false</fullscreen_menubar>
|
||||
<check_update>false</check_update>
|
||||
<check_update>true</check_update>
|
||||
<save_screenshot>true</save_screenshot>
|
||||
<vk_warning>false</vk_warning>
|
||||
<gp_download>true</gp_download>
|
||||
|
|
|
@ -86,3 +86,26 @@ installEmuZip(){
|
|||
|
||||
}
|
||||
|
||||
gcd() {
|
||||
while [ $2 -ne 0 ]; do
|
||||
set -- $2 $(( $1 % $2 ))
|
||||
done
|
||||
echo $1
|
||||
}
|
||||
|
||||
|
||||
function getScreenAR(){
|
||||
dimensions=$(system_profiler SPDisplaysDataType | awk '/Resolution/{print $2, $4}')
|
||||
|
||||
width=$(echo $dimensions | cut -d ' ' -f 1)
|
||||
height=$(echo $dimensions | cut -d ' ' -f 2)
|
||||
|
||||
|
||||
g=$(gcd $width $height)
|
||||
|
||||
aspect_ratio_width=$((width / g))
|
||||
aspect_ratio_height=$((height / g))
|
||||
|
||||
return $aspect_ratio_width$aspect_ratio_height
|
||||
|
||||
}
|
|
@ -11,7 +11,7 @@ RetroArch_cores="$HOME/Library/Application Support/RetroArch/cores"
|
|||
RetroArch_path="$HOME/Library/Application Support/RetroArch"
|
||||
RetroArch_coresURL="https://buildbot.libretro.com/nightly/apple/osx/${appleChip}/latest/"
|
||||
RetroArch_coresExtension="dylib.zip"
|
||||
ESDE_toolPath="$HOME/Application/EmulationStation Desktop Edition.app"
|
||||
ESDE_toolPath="$HOME/Applications/ES-DE.dmg"
|
||||
ESDE_addSteamInputFile="$EMUDECKGIT/darwin/configs/steam-input/emulationstation-de_controller_config.vdf"
|
||||
steam_input_templateFolder="$HOME/Library/Application Support/Steam/Steam.AppBundle/Steam/Contents/MacOS/controller_base/templates/"
|
||||
SRM_userData_directory="darwin/configs/steam-rom-manager/userData"
|
||||
|
|
|
@ -222,9 +222,9 @@ RetroArch_update(){
|
|||
RetroArch_setEmulationFolder(){
|
||||
setMSG "Setting $RetroArch_emuName Emulation Folder"
|
||||
|
||||
RetroArch_setConfigOverride 'system_directory' "${biosPath}" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'rgui_browser_directory' "${romsPath}" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'cheat_database_path' "${storagePath}/retroarch/cheats" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'system_directory' "\"${biosPath}\"" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'rgui_browser_directory' "\"${romsPath}\"" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'cheat_database_path' "\"${storagePath}/retroarch/cheats\"" "$RetroArch_configFile"
|
||||
}
|
||||
|
||||
#SetupSaves
|
||||
|
@ -233,8 +233,8 @@ RetroArch_setupSaves(){
|
|||
linkToSaveFolder retroarch states "$RetroArch_path/states"
|
||||
linkToSaveFolder retroarch saves "$RetroArch_path/saves"
|
||||
|
||||
RetroArch_setConfigOverride 'savestate_directory' "$savesPath/retroarch/states" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'savefile_directory' "$savesPath/retroarch/saves" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'savestate_directory' "\"$savesPath/retroarch/states\"" "$RetroArch_configFile"
|
||||
RetroArch_setConfigOverride 'savefile_directory' "\"$savesPath/retroarch/saves\"" "$RetroArch_configFile"
|
||||
|
||||
}
|
||||
|
||||
|
|
6
tools/cloud/Dropout.sh
Normal file
6
tools/cloud/Dropout.sh
Normal file
|
@ -0,0 +1,6 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
LINK=https://www.dropout.tv/browse
|
||||
|
||||
source ./cloud.conf
|
||||
"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
|
Loading…
Reference in a new issue