Merge remote-tracking branch 'upstream/cooker-0.6.3b' into cooker-0.6.3b-icenine451

This commit is contained in:
icenine451 2023-03-21 08:36:22 -04:00
commit 9bbbe86476
7 changed files with 599 additions and 540 deletions

View file

@ -47,14 +47,16 @@ jobs:
- name: Build flatpak - name: Build flatpak
run: | run: |
git config --global protocol.file.allow always git config --global protocol.file.allow always
mkdir -vp ${GITHUB_WORKSPACE}/local
mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
- name: Create Artifact for flathub - name: Create Artifact for flathub
run: | run: |
tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker . tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz)) hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }} mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
continue-on-error: true continue-on-error: true
- name: Create Bundle - name: Create Bundle

View file

@ -44,7 +44,9 @@ jobs:
- name: Build flatpak - name: Build flatpak
run: | run: |
git config --global protocol.allow always git config --global protocol.file.allow always
mkdir -vp ${GITHUB_WORKSPACE}/local
mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
- name: Create Artifact for flathub - name: Create Artifact for flathub

View file

@ -1,10 +1,8 @@
[Audio] [Audio]
audio_emulation=0
audio_emulation\default=true
enable_audio_stretching=true enable_audio_stretching=true
enable_audio_stretching\default=true enable_audio_stretching\default=true
enable_dsp_lle=false
enable_dsp_lle\default=true
enable_dsp_lle_multithread=false
enable_dsp_lle_multithread\default=true
mic_input_device=Default mic_input_device=Default
mic_input_device\default=true mic_input_device\default=true
mic_input_type=0 mic_input_type=0
@ -39,43 +37,43 @@ camera_outer_right_name\default=true
[Controls] [Controls]
profile=0 profile=0
profile\default=true profile\default=true
profiles\1\button_a="button:0,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_a="button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_a\default=false profiles\1\button_a\default=false
profiles\1\button_b="button:1,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_b="button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_b\default=false profiles\1\button_b\default=false
profiles\1\button_debug="code:79,engine:keyboard" profiles\1\button_debug="code:79,engine:keyboard"
profiles\1\button_debug\default=true profiles\1\button_debug\default=true
profiles\1\button_down="direction:down,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_down="direction:down,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
profiles\1\button_down\default=false profiles\1\button_down\default=false
profiles\1\button_gpio14="code:80,engine:keyboard" profiles\1\button_gpio14="code:80,engine:keyboard"
profiles\1\button_gpio14\default=true profiles\1\button_gpio14\default=true
profiles\1\button_home="button:8,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_home="code:66,engine:keyboard"
profiles\1\button_home\default=false profiles\1\button_home\default=true
profiles\1\button_l="button:4,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_l="button:4,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_l\default=false profiles\1\button_l\default=false
profiles\1\button_left="direction:left,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_left="direction:left,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
profiles\1\button_left\default=false profiles\1\button_left\default=false
profiles\1\button_r="button:5,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_r="button:5,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_r\default=false profiles\1\button_r\default=false
profiles\1\button_right="direction:right,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_right="direction:right,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
profiles\1\button_right\default=false profiles\1\button_right\default=false
profiles\1\button_select="button:6,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_select="button:6,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_select\default=false profiles\1\button_select\default=false
profiles\1\button_start="button:7,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_start="button:7,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_start\default=false profiles\1\button_start\default=false
profiles\1\button_up="direction:up,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_up="direction:up,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
profiles\1\button_up\default=false profiles\1\button_up\default=false
profiles\1\button_x="button:2,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_x="button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_x\default=false profiles\1\button_x\default=false
profiles\1\button_y="button:3,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_y="button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\button_y\default=false profiles\1\button_y\default=false
profiles\1\button_zl="axis:3,direction:-,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:-0.5" profiles\1\button_zl="axis:2,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
profiles\1\button_zl\default=false profiles\1\button_zl\default=false
profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:0.5" profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
profiles\1\button_zr\default=false profiles\1\button_zr\default=false
profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\c_stick\default=false profiles\1\c_stick\default=false
profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
profiles\1\circle_pad\default=false profiles\1\circle_pad\default=false
profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0" profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0"
profiles\1\motion_device\default=true profiles\1\motion_device\default=true
@ -106,10 +104,12 @@ use_cpu_jit=true
use_cpu_jit\default=true use_cpu_jit\default=true
[Data%20Storage] [Data%20Storage]
nand_directory=~/retrodeck/saves/n3ds/citra/nand/ nand_directory=/home/deck/retrodeck/saves/n3ds/citra/nand/
nand_directory\default=false nand_directory\default=false
sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/ sdmc_directory=/home/deck/retrodeck/saves/n3ds/citra/sdmc/
sdmc_directory\default=false sdmc_directory\default=false
use_custom_storage=true
use_custom_storage\default=false
use_virtual_sd=true use_virtual_sd=true
use_virtual_sd\default=true use_virtual_sd\default=true
@ -178,6 +178,8 @@ LLE\NWM=false
LLE\NWM\default=true LLE\NWM\default=true
LLE\PDN=false LLE\PDN=false
LLE\PDN\default=true LLE\PDN\default=true
LLE\PLGLDR=false
LLE\PLGLDR\default=true
LLE\PM=false LLE\PM=false
LLE\PM\default=true LLE\PM\default=true
LLE\PS=false LLE\PS=false
@ -194,36 +196,43 @@ LLE\SPI=false
LLE\SPI\default=true LLE\SPI\default=true
LLE\SSL=false LLE\SSL=false
LLE\SSL\default=true LLE\SSL\default=true
gdbstub_port=24689 gdbstub_port=@Variant(\0\0\0\x85`q)
gdbstub_port\default=true gdbstub_port\default=true
record_frame_times=false record_frame_times=false
use_gdbstub=false use_gdbstub=false
use_gdbstub\default=true use_gdbstub\default=true
[Layout] [Layout]
custom_bottom_bottom=480 custom_bottom_bottom=@Variant(\0\0\0\x85\x1\xe0)
custom_bottom_bottom\default=true custom_bottom_bottom\default=true
custom_bottom_left=40 custom_bottom_left=@Variant(\0\0\0\x85\0()
custom_bottom_left\default=true custom_bottom_left\default=true
custom_bottom_right=360 custom_bottom_right=@Variant(\0\0\0\x85\x1h)
custom_bottom_right\default=true custom_bottom_right\default=true
custom_bottom_top=240 custom_bottom_top=@Variant(\0\0\0\x85\0\xf0)
custom_bottom_top\default=true custom_bottom_top\default=true
custom_layout=false custom_layout=false
custom_layout\default=true custom_layout\default=true
custom_top_bottom=240 custom_second_layer_opacity=@Variant(\0\0\0\x85\0\x64)
custom_second_layer_opacity\default=true
custom_top_bottom=@Variant(\0\0\0\x85\0\xf0)
custom_top_bottom\default=true custom_top_bottom\default=true
custom_top_left=0 custom_top_left=@Variant(\0\0\0\x85\0\0)
custom_top_left\default=true custom_top_left\default=true
custom_top_right=400 custom_top_right=@Variant(\0\0\0\x85\x1\x90)
custom_top_right\default=true custom_top_right\default=true
custom_top_top=0 custom_top_top=@Variant(\0\0\0\x85\0\0)
custom_top_top\default=true custom_top_top\default=true
factor_3d=0 factor_3d=0
factor_3d\default=true factor_3d\default=true
filter_mode=true filter_mode=true
filter_mode\default=true filter_mode\default=true
large_screen_proportion=@Variant(\0\0\0\x87@\x80\0\0)
large_screen_proportion\default=true
layout_option=0 layout_option=0
layout_option\default=true
mono_render_option=0
mono_render_option\default=true
pp_shader_name=none (builtin) pp_shader_name=none (builtin)
pp_shader_name\default=true pp_shader_name\default=true
render_3d=0 render_3d=0
@ -244,20 +253,16 @@ bg_green=0
bg_green\default=true bg_green\default=true
bg_red=0 bg_red=0
bg_red\default=true bg_red\default=true
frame_limit=100 frame_limit=@Variant(\0\0\0\x85\0\x64)
frame_limit\default=true frame_limit\default=true
frame_limit_alternate=200 resolution_factor=@Variant(\0\0\0\x85\0\x1)
frame_limit_alternate\default=true
resolution_factor=1
resolution_factor\default=true resolution_factor\default=true
shaders_accurate_mul=true shaders_accurate_mul=true
shaders_accurate_mul\default=true shaders_accurate_mul\default=true
texture_filter_name=none texture_filter_name=Linear (Default)
texture_filter_name\default=true texture_filter_name\default=false
use_disk_shader_cache=true use_disk_shader_cache=true
use_disk_shader_cache\default=true use_disk_shader_cache\default=true
use_frame_limit_alternate=false
use_frame_limit_alternate\default=true
use_hw_renderer=true use_hw_renderer=true
use_hw_renderer\default=true use_hw_renderer\default=true
use_hw_shader=true use_hw_shader=true
@ -268,12 +273,18 @@ use_vsync_new=true
use_vsync_new\default=true use_vsync_new\default=true
[System] [System]
allow_plugin_loader=true
allow_plugin_loader\default=true
init_clock=0 init_clock=0
init_clock\default=true init_clock\default=true
init_time=946681277 init_time=@Variant(\0\0\0\x84\0\0\0\0\x38m5\xbd)
init_time\default=true init_time\default=true
init_time_offset=@Variant(\0\0\0\x81\0\0\0\0\0\0\0\0)
init_time_offset\default=true
is_new_3ds=true is_new_3ds=true
is_new_3ds\default=true is_new_3ds\default=true
plugin_loader=false
plugin_loader\default=true
region_value=-1 region_value=-1
region_value\default=true region_value\default=true
@ -330,16 +341,17 @@ Paths\language=en
Paths\language\default=false Paths\language\default=false
Paths\moviePlaybackPath= Paths\moviePlaybackPath=
Paths\movieRecordPath= Paths\movieRecordPath=
Paths\recentFiles= Paths\recentFiles=@Invalid()
Paths\romsPath=/home/deck/retrodeck/roms/n3ds Paths\romsPath=
Paths\screenshotPath= Paths\screenshotPath=/home/deck/retrodeck/screenshots
Paths\screenshotPath\default=false
Paths\symbolsPath= Paths\symbolsPath=
Paths\videoDumpingPath= Paths\videoDumpingPath=
Shortcuts\Main%20Window\Advance%20Frame\Context=2 Shortcuts\Main%20Window\Advance%20Frame\Context=1
Shortcuts\Main%20Window\Advance%20Frame\Context\default=true Shortcuts\Main%20Window\Advance%20Frame\Context\default=false
Shortcuts\Main%20Window\Advance%20Frame\KeySeq=\\ Shortcuts\Main%20Window\Advance%20Frame\KeySeq=
Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true
Shortcuts\Main%20Window\Capture%20Screenshot\Context=2 Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
@ -347,6 +359,10 @@ Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=2
Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=true
Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq=Ctrl+-
Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=true
Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2
Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true
Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=- Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
@ -357,21 +373,25 @@ Shortcuts\Main%20Window\Exit%20Citra\KeySeq=T
Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false
Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y
Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false
Shortcuts\Main%20Window\Fullscreen\Context=1 Shortcuts\Main%20Window\Fullscreen\Context=1
Shortcuts\Main%20Window\Fullscreen\Context\default=true Shortcuts\Main%20Window\Fullscreen\Context\default=true
Shortcuts\Main%20Window\Fullscreen\KeySeq=F11 Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
Shortcuts\Main%20Window\Increase%203D%20Factor\Context=2
Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=true
Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq=Ctrl++
Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=true
Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2
Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true
Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+ Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+
Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true
Shortcuts\Main%20Window\Load%20Amiibo\Context=2 Shortcuts\Main%20Window\Load%20Amiibo\Context=3
Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2
Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true
Shortcuts\Main%20Window\Load%20File\Context=1 Shortcuts\Main%20Window\Load%20File\Context=3
Shortcuts\Main%20Window\Load%20File\Context\default=true Shortcuts\Main%20Window\Load%20File\Context\default=true
Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
Shortcuts\Main%20Window\Load%20File\KeySeq\default=true Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
@ -379,6 +399,10 @@ Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1
Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true
Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R
Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false
Shortcuts\Main%20Window\Mute%20Audio\Context=1
Shortcuts\Main%20Window\Mute%20Audio\Context\default=true
Shortcuts\Main%20Window\Mute%20Audio\KeySeq=Ctrl+M
Shortcuts\Main%20Window\Mute%20Audio\KeySeq\default=true
Shortcuts\Main%20Window\Remove%20Amiibo\Context=2 Shortcuts\Main%20Window\Remove%20Amiibo\Context=2
Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true
Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3 Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3
@ -401,20 +425,24 @@ Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
Shortcuts\Main%20Window\Swap%20Screens\Context=1 Shortcuts\Main%20Window\Swap%20Screens\Context=1
Shortcuts\Main%20Window\Swap%20Screens\Context\default=true Shortcuts\Main%20Window\Swap%20Screens\Context\default=true
Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Y Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9
Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true
Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2 Shortcuts\Main%20Window\Toggle%203D\Context=2
Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true Shortcuts\Main%20Window\Toggle%203D\Context\default=true
Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3
Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq\default=true Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=true
Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=false
Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2
Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=false
Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A
Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=2
Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=true
Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=Ctrl+Z
Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10
@ -423,17 +451,17 @@ Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=2 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=1
Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=true Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=false
Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=Ctrl+D Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=
Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true
UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4\x9c\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xf0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64) UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4 \0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0t\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0\x97\0\0\x4*\0\0\x2\x43\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43) UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f)
UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3) UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k) UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
UILayout\microProfileDialogVisible=false UILayout\microProfileDialogVisible=false
UILayout\microProfileDialogVisible\default=true UILayout\microProfileDialogVisible\default=true
UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0n\x1\0\0\x3\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xd2\x1\0\0\x3\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0N\x1\0\0\x3\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xd3\x1\0\0\x3\0\0\x3U\0\0\x1Q\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0h\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xaa\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x41\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xc3\0\xff\xff\xff\0\0\x4 \0\0\x1^\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
Updater\check_for_update_on_start=true Updater\check_for_update_on_start=true
Updater\check_for_update_on_start\default=true Updater\check_for_update_on_start\default=true
Updater\update_on_close=false Updater\update_on_close=false
@ -448,13 +476,13 @@ enable_discord_presence=true
enable_discord_presence\default=true enable_discord_presence\default=true
firstStart=false firstStart=false
firstStart\default=false firstStart\default=false
fullscreen=true fullscreen=false
fullscreen\default=true fullscreen\default=true
hideInactiveMouse=false hideInactiveMouse=false
hideInactiveMouse\default=true hideInactiveMouse\default=true
pauseWhenInBackground=true pauseWhenInBackground=false
pauseWhenInBackground\default=true pauseWhenInBackground\default=true
screenshot_resolution_factor=0 screenshot_resolution_factor=@Variant(\0\0\0\x85\0\0)
screenshot_resolution_factor\default=true screenshot_resolution_factor\default=true
showConsole=false showConsole=false
showConsole\default=true showConsole\default=true
@ -494,8 +522,8 @@ video_encoder_options\default=true
[WebService] [WebService]
citra_token= citra_token=
citra_username= citra_username=RetroDECK
enable_telemetry=false enable_telemetry=false
enable_telemetry\default=false enable_telemetry\default=false
web_api_url=https://api.citra-emu.org web_api_url=https://api.citra-emu.org
web_api_url\default=true web_api_url\default=true

File diff suppressed because it is too large Load diff

View file

@ -824,7 +824,7 @@
<fullname>Nintendo 3DS</fullname> <fullname>Nintendo 3DS</fullname>
<path>%ROMPATH%/n3ds</path> <path>%ROMPATH%/n3ds</path>
<extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension> <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
<command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command> <command label="Citra (Standalone)">%EMULATOR_CITRA% -f %ROM%</command>
<command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command> <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
<command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command> <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
<platform>n3ds</platform> <platform>n3ds</platform>

View file

@ -847,7 +847,7 @@ citra_init() {
mkdir -pv "$rdhome/saves/n3ds/citra/sdmc/" mkdir -pv "$rdhome/saves/n3ds/citra/sdmc/"
dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata" dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log" dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini
sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
} }

View file

@ -88,7 +88,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: main branch: cooker-0.6.3b
- name: xmlstarlet - name: xmlstarlet
config-opts: config-opts:
@ -1093,4 +1093,4 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: cooker-0.6.3b branch: cooker-0.6.3b