diff --git a/emu-configs/Dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini similarity index 100% rename from emu-configs/Dolphin/Dolphin.ini rename to emu-configs/dolphin/Dolphin.ini diff --git a/emu-configs/Dolphin/GCPadNew.ini b/emu-configs/dolphin/GCPadNew.ini similarity index 100% rename from emu-configs/Dolphin/GCPadNew.ini rename to emu-configs/dolphin/GCPadNew.ini diff --git a/emu-configs/Dolphin/GFX.ini b/emu-configs/dolphin/GFX.ini similarity index 100% rename from emu-configs/Dolphin/GFX.ini rename to emu-configs/dolphin/GFX.ini diff --git a/emu-configs/Dolphin/Hotkeys.ini b/emu-configs/dolphin/Hotkeys.ini similarity index 100% rename from emu-configs/Dolphin/Hotkeys.ini rename to emu-configs/dolphin/Hotkeys.ini diff --git a/emu-configs/Dolphin/Qt.ini b/emu-configs/dolphin/Qt.ini similarity index 100% rename from emu-configs/Dolphin/Qt.ini rename to emu-configs/dolphin/Qt.ini diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch-core-options.cfg index a400680a..b7ab1bd2 100644 --- a/emu-configs/retroarch-core-options.cfg +++ b/emu-configs/retroarch-core-options.cfg @@ -182,7 +182,7 @@ genesis_plus_gx_aspect_ratio = "auto" genesis_plus_gx_audio_filter = "disabled" genesis_plus_gx_bios = "disabled" genesis_plus_gx_blargg_ntsc_filter = "disabled" -genesis_plus_gx_bram = "per bios" +genesis_plus_gx_bram = "per game" genesis_plus_gx_cdda_volume = "100" genesis_plus_gx_fm_preamp = "100" genesis_plus_gx_force_dtack = "enabled" diff --git a/emu-configs/yuzu-qt-config.ini b/emu-configs/yuzu/qt-config.ini similarity index 88% rename from emu-configs/yuzu-qt-config.ini rename to emu-configs/yuzu/qt-config.ini index 69935549..6149a971 100644 --- a/emu-configs/yuzu-qt-config.ini +++ b/emu-configs/yuzu/qt-config.ini @@ -7,6 +7,7 @@ volume=100 volume\default=true [Controls] +="======" controller_navigation=true controller_navigation\default=true debug_pad_button_a="toggle:0,code:67,engine:keyboard" @@ -61,6 +62,8 @@ enable_accurate_vibrations=false enable_accurate_vibrations\default=true enable_raw_input=false enable_raw_input\default=true +enable_ring_controller=true +enable_ring_controller\default=true enable_udp_controller=false enable_udp_controller\default=true keyboard_enabled=false @@ -77,15 +80,9 @@ player_0_body_color_left=4278893030 player_0_body_color_left\default=false player_0_body_color_right=4294917160 player_0_body_color_right\default=false -<<<<<<< HEAD -player_0_button_a="button:1,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_a\default=false -player_0_button_b="button:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -======= player_0_button_a="pad:0,button:1,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_button_a\default=false player_0_button_b="pad:0,button:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl" ->>>>>>> cooker player_0_button_b\default=false player_0_button_color_left=4278197790 player_0_button_color_left\default=false @@ -97,24 +94,9 @@ player_0_button_dleft="hat:0,direction:left,guid:03000000de280000ff1100000100000 player_0_button_dleft\default=false player_0_button_dright="hat:0,direction:right,guid:03000000de280000ff11000001000000,port:0,engine:sdl" player_0_button_dright\default=false -<<<<<<< HEAD -player_0_button_dup="hat:0,direction:up,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_dup\default=false -player_0_button_home="button:8,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_home\default=false -player_0_button_l="button:4,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_l\default=false -player_0_button_lstick="button:9,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_lstick\default=false -player_0_button_minus="button:6,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_minus\default=false -player_0_button_plus="button:7,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_plus\default=false -player_0_button_r="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -======= player_0_button_dup="hat:0,pad:0,direction:up,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_button_dup\default=false -player_0_button_home=[empty] +player_0_button_home="code:82,pad:0,port:0,engine:keyboard" player_0_button_home\default=false player_0_button_l="pad:0,button:4,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_button_l\default=false @@ -125,7 +107,6 @@ player_0_button_minus\default=false player_0_button_plus="pad:0,button:7,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_button_plus\default=false player_0_button_r="pad:0,button:5,port:0,guid:03000000de280000ff11000001000000,engine:sdl" ->>>>>>> cooker player_0_button_r\default=false player_0_button_rstick="button:10,guid:03000000de280000ff11000001000000,port:0,engine:sdl" player_0_button_rstick\default=false @@ -135,19 +116,6 @@ player_0_button_sl="button:4,guid:03000000de280000ff11000001000000,port:0,engine player_0_button_sl\default=false player_0_button_sr="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl" player_0_button_sr\default=false -<<<<<<< HEAD -player_0_button_x="button:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_x\default=false -player_0_button_y="button:2,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -player_0_button_y\default=false -player_0_button_zl="threshold:0.500000,axis:2,guid:03000000de280000ff11000001000000,port:0,invert:+,engine:sdl" -player_0_button_zl\default=false -player_0_button_zr="threshold:0.500000,axis:5,guid:03000000de280000ff11000001000000,port:0,invert:+,engine:sdl" -player_0_button_zr\default=false -player_0_connected=true -player_0_connected\default=true -player_0_lstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:0.000000,axis_y:1,offset_x:-0.000000,axis_x:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -======= player_0_button_x="pad:0,button:3,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_button_x\default=false player_0_button_y="pad:0,button:2,port:0,guid:03000000de280000ff11000001000000,engine:sdl" @@ -159,17 +127,12 @@ player_0_button_zr\default=false player_0_connected=true player_0_connected\default=true player_0_lstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:1,axis_x:0,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl" ->>>>>>> cooker player_0_lstick\default=false player_0_motionleft=[empty] player_0_motionleft\default=false player_0_motionright=[empty] player_0_motionright\default=false -<<<<<<< HEAD -player_0_rstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:0.000000,axis_y:4,offset_x:-0.000000,axis_x:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl" -======= -player_0_rstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:3,axis_x:4,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl" ->>>>>>> cooker +player_0_rstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:4,axis_x:3,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl" player_0_rstick\default=false player_0_type=0 player_0_type\default=true @@ -629,60 +592,60 @@ player_8_body_color_left=702950 player_8_body_color_left\default=true player_8_body_color_right=16727080 player_8_body_color_right\default=true -player_8_button_a="toggle:0,code:67,engine:keyboard" -player_8_button_a\default=true -player_8_button_b="toggle:0,code:88,engine:keyboard" -player_8_button_b\default=true +player_8_button_a="engine:keyboard,code:67,toggle:0" +player_8_button_a\default=false +player_8_button_b="engine:keyboard,code:88,toggle:0" +player_8_button_b\default=false player_8_button_color_left=7710 player_8_button_color_left\default=true player_8_button_color_right=1968650 player_8_button_color_right\default=true -player_8_button_ddown="toggle:0,code:16777237,engine:keyboard" -player_8_button_ddown\default=true -player_8_button_dleft="toggle:0,code:16777234,engine:keyboard" -player_8_button_dleft\default=true -player_8_button_dright="toggle:0,code:16777236,engine:keyboard" -player_8_button_dright\default=true -player_8_button_dup="toggle:0,code:16777235,engine:keyboard" -player_8_button_dup\default=true -player_8_button_home="toggle:0,code:0,engine:keyboard" -player_8_button_home\default=true -player_8_button_l="toggle:0,code:81,engine:keyboard" -player_8_button_l\default=true -player_8_button_lstick="toggle:0,code:70,engine:keyboard" -player_8_button_lstick\default=true -player_8_button_minus="toggle:0,code:78,engine:keyboard" -player_8_button_minus\default=true -player_8_button_plus="toggle:0,code:77,engine:keyboard" -player_8_button_plus\default=true -player_8_button_r="toggle:0,code:69,engine:keyboard" -player_8_button_r\default=true -player_8_button_rstick="toggle:0,code:71,engine:keyboard" -player_8_button_rstick\default=true -player_8_button_screenshot="toggle:0,code:0,engine:keyboard" -player_8_button_screenshot\default=true -player_8_button_sl="toggle:0,code:81,engine:keyboard" -player_8_button_sl\default=true -player_8_button_sr="toggle:0,code:69,engine:keyboard" -player_8_button_sr\default=true -player_8_button_x="toggle:0,code:86,engine:keyboard" -player_8_button_x\default=true -player_8_button_y="toggle:0,code:90,engine:keyboard" -player_8_button_y\default=true -player_8_button_zl="toggle:0,code:82,engine:keyboard" -player_8_button_zl\default=true -player_8_button_zr="toggle:0,code:84,engine:keyboard" -player_8_button_zr\default=true +player_8_button_ddown="engine:keyboard,code:16777237,toggle:0" +player_8_button_ddown\default=false +player_8_button_dleft="engine:keyboard,code:16777234,toggle:0" +player_8_button_dleft\default=false +player_8_button_dright="engine:keyboard,code:16777236,toggle:0" +player_8_button_dright\default=false +player_8_button_dup="engine:keyboard,code:16777235,toggle:0" +player_8_button_dup\default=false +player_8_button_home="engine:keyboard,code:0,toggle:0" +player_8_button_home\default=false +player_8_button_l="engine:keyboard,code:81,toggle:0" +player_8_button_l\default=false +player_8_button_lstick="engine:keyboard,code:70,toggle:0" +player_8_button_lstick\default=false +player_8_button_minus="engine:keyboard,code:78,toggle:0" +player_8_button_minus\default=false +player_8_button_plus="engine:keyboard,code:77,toggle:0" +player_8_button_plus\default=false +player_8_button_r="engine:keyboard,code:69,toggle:0" +player_8_button_r\default=false +player_8_button_rstick="engine:keyboard,code:71,toggle:0" +player_8_button_rstick\default=false +player_8_button_screenshot="engine:keyboard,code:0,toggle:0" +player_8_button_screenshot\default=false +player_8_button_sl="engine:keyboard,code:81,toggle:0" +player_8_button_sl\default=false +player_8_button_sr="engine:keyboard,code:69,toggle:0" +player_8_button_sr\default=false +player_8_button_x="engine:keyboard,code:86,toggle:0" +player_8_button_x\default=false +player_8_button_y="engine:keyboard,code:90,toggle:0" +player_8_button_y\default=false +player_8_button_zl="engine:keyboard,code:82,toggle:0" +player_8_button_zl\default=false +player_8_button_zr="engine:keyboard,code:84,toggle:0" +player_8_button_zr\default=false player_8_connected=false player_8_connected\default=true -player_8_lstick="modifier_scale:0.500000,modifier:toggle$00$1code$016777248$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,up:toggle$00$1code$087$1engine$0keyboard,engine:analog_from_button" -player_8_lstick\default=true -player_8_motionleft="toggle:0,code:55,engine:keyboard" -player_8_motionleft\default=true -player_8_motionright="toggle:0,code:56,engine:keyboard" -player_8_motionright\default=true -player_8_rstick="modifier_scale:0.500000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,up:toggle$00$1code$073$1engine$0keyboard,engine:analog_from_button" -player_8_rstick\default=true +player_8_lstick="engine:analog_from_button,up:toggle$00$1code$087$1engine$0keyboard,down:toggle$00$1code$083$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,modifier:toggle$00$1code$016777248$1engine$0keyboard,modifier_scale:0.500000" +player_8_lstick\default=false +player_8_motionleft="engine:keyboard,code:55,toggle:0" +player_8_motionleft\default=false +player_8_motionright="engine:keyboard,code:56,toggle:0" +player_8_motionright\default=false +player_8_rstick="engine:analog_from_button,up:toggle$00$1code$073$1engine$0keyboard,down:toggle$00$1code$075$1engine$0keyboard,left:toggle$00$1code$074$1engine$0keyboard,right:toggle$00$1code$076$1engine$0keyboard,modifier:toggle$00$1code$00$1engine$0keyboard,modifier_scale:0.500000" +player_8_rstick\default=false player_8_type=0 player_8_type\default=true player_8_vibration_enabled=true @@ -753,6 +716,8 @@ player_9_vibration_enabled=true player_9_vibration_enabled\default=true player_9_vibration_strength=100 player_9_vibration_strength\default=true +ring_controller="modifier_scale:0.050000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$00$1engine$0keyboard,up:toggle$00$1code$00$1engine$0keyboard,engine:analog_from_button" +ring_controller\default=true tas_enable=false tas_enable\default=true tas_loop=false @@ -775,8 +740,8 @@ touchscreen_enabled=true touchscreen_enabled\default=true udp_input_servers=127.0.0.1:26760 udp_input_servers\default=true -use_docked_mode=true -use_docked_mode\default=true +use_docked_mode=false +use_docked_mode\default=false vibration_enabled=true vibration_enabled\default=true @@ -787,8 +752,8 @@ use_multi_core=true use_multi_core\default=true [Cpu] -cpu_accuracy=2 -cpu_accuracy\default=false +cpu_accuracy=0 +cpu_accuracy\default=true cpu_accuracy_first_time=false cpu_accuracy_first_time\default=false cpu_debug_mode=false @@ -829,11 +794,8 @@ cpuopt_unsafe_unfuse_fma=true cpuopt_unsafe_unfuse_fma\default=true [Data%20Storage] -<<<<<<< HEAD -dump_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/dump -======= +="======" dump_directory=/var/data/yuzu/dump ->>>>>>> cooker dump_directory\default=true gamecard_current_game=false gamecard_current_game\default=true @@ -841,15 +803,6 @@ gamecard_inserted=false gamecard_inserted\default=true gamecard_path= gamecard_path\default=true -<<<<<<< HEAD -load_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/load -load_directory\default=true -nand_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/nand -nand_directory\default=true -sdmc_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/sdmc -sdmc_directory\default=true -tas_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/tas -======= load_directory=/var/data/yuzu/load load_directory\default=true nand_directory=/var/data/yuzu/nand @@ -857,7 +810,6 @@ nand_directory\default=true sdmc_directory=/var/data/yuzu/sdmc sdmc_directory\default=true tas_directory=/var/data/yuzu/tas ->>>>>>> cooker tas_directory\default=true use_virtual_sd=true use_virtual_sd\default=true @@ -873,6 +825,8 @@ enable_all_controllers=false enable_all_controllers\default=true enable_fs_access_log=false enable_fs_access_log\default=true +gdbstub_port=6543 +gdbstub_port\default=true program_args= program_args\default=true quest_flag=false @@ -880,12 +834,11 @@ quest_flag\default=true record_frame_times=false use_debug_asserts=false use_debug_asserts\default=true +use_gdbstub=false +use_gdbstub\default=true [DisabledAddOns] size=0 - - - [Miscellaneous] log_filter=*:Info @@ -900,8 +853,8 @@ anti_aliasing=0 anti_aliasing\default=true aspect_ratio=0 aspect_ratio\default=true -backend=1 -backend\default=false +backend=0 +backend\default=true bg_blue=0 bg_blue\default=true bg_green=0 @@ -924,9 +877,9 @@ nsight_aftermath=false nsight_aftermath\default=true nvdec_emulation=2 nvdec_emulation\default=true -resolution_setup=0 -resolution_setup\default=false -scaling_filter=5 +resolution_setup=2 +resolution_setup\default=true +scaling_filter=0 scaling_filter\default=false shader_backend=0 shader_backend\default=false @@ -938,8 +891,8 @@ use_asynchronous_gpu_emulation=true use_asynchronous_gpu_emulation\default=true use_asynchronous_shaders=true use_asynchronous_shaders\default=false -use_disk_shader_cache=true -use_disk_shader_cache\default=true +use_disk_shader_cache=false +use_disk_shader_cache\default=false use_fast_gpu_time=true use_fast_gpu_time\default=true use_speed_limit=true @@ -950,12 +903,9 @@ vulkan_device=0 vulkan_device\default=true [Services] +="======" network_interface=None -<<<<<<< HEAD -network_interface\default=true -======= network_interface\default=false ->>>>>>> cooker [System] current_user=0 @@ -966,8 +916,8 @@ custom_rtc_enabled=false custom_rtc_enabled\default=true language_index=1 language_index\default=true -region_index=1 -region_index\default=true +region_index=2 +region_index\default=false rng_seed=0 rng_seed\default=true rng_seed_enabled=false @@ -1039,7 +989,7 @@ Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=F8 Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=true Shortcuts\Main%20Window\Change%20Docked%20Mode\Context=2 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context\default=true -Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+Y +Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq= Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=false Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=F10 Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=true @@ -1063,10 +1013,10 @@ Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true Shortcuts\Main%20Window\Exit%20yuzu\Context=1 Shortcuts\Main%20Window\Exit%20yuzu\Context\default=true -Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Minus -Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=true -Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Q -Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Plus +Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=false +Shortcuts\Main%20Window\Exit%20yuzu\KeySeq= +Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=false Shortcuts\Main%20Window\Fullscreen\Context=1 Shortcuts\Main%20Window\Fullscreen\Context\default=true Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq= @@ -1081,7 +1031,7 @@ Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O Shortcuts\Main%20Window\Load%20File\KeySeq\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true -Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq= +Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=Home+Y Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=F2 Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=true @@ -1135,7 +1085,7 @@ Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq=Ctrl+F9 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true -Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq= +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq=Home+X Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true @@ -1155,12 +1105,12 @@ UIGameList\row_2_text_id\default=true UIGameList\show_add_ons=true UIGameList\show_add_ons\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\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0Y\0\0\x4*\0\0\x2\x8a\0\0\0\xd6\0\0\0v\0\0\x4*\0\0\x2\x8a\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0v\0\0\x4*\0\0\x2\x8a) +UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0v\0\0\x4*\0\0\x2\x8a\0\0\0\xd6\0\0\0v\0\0\x4*\0\0\x2\x8a\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0v\0\0\x4*\0\0\x2\x8a) 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\x5\0\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\microProfileDialogVisible=false UILayout\microProfileDialogVisible\default=true -UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\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\0Y\0\xff\xff\xff\0\0\x3U\0\0\x1\xeb\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\x1\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\0y\x1\0\0\x3\0\0\x3U\0\0\x1\xd6\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) calloutFlags=1 calloutFlags\default=false confirmClose=true @@ -1179,8 +1129,8 @@ hideInactiveMouse=true hideInactiveMouse\default=true muteWhenInBackground=false muteWhenInBackground\default=true -pauseWhenInBackground=false -pauseWhenInBackground\default=true +pauseWhenInBackground=true +pauseWhenInBackground\default=false select_user_on_boot=false select_user_on_boot\default=true showConsole=false @@ -1195,6 +1145,7 @@ theme=colorful theme\default=true [WebService] +="======" enable_telemetry=false enable_telemetry\default=false web_api_url=https://api.yuzu-emu.org @@ -1202,8 +1153,4 @@ web_api_url\default=true yuzu_token= yuzu_token\default=true yuzu_username=RetroDECK -<<<<<<< HEAD -yuzu_username\default=true -======= -yuzu_username\default=true ->>>>>>> cooker +yuzu_username\default=true \ No newline at end of file diff --git a/flathub-push.sh b/flathub-push.sh old mode 100644 new mode 100755 index 56f4135f..1d8451d7 --- a/flathub-push.sh +++ b/flathub-push.sh @@ -1,5 +1,7 @@ #!/bin/bash +branch="cooker-"$(date +%d%m%y.%H%M) + cd ~/gits rm -rf flathub git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub @@ -12,6 +14,7 @@ git submodule update #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/ cd ~/gits/flathub +git checkout -b $branch git rm -rf * git clean -fxd # restroing git index @@ -68,4 +71,4 @@ git submodule deinit -f . git submodule update --init --recursive git add * git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/main" -git push origin cooker-$(date +%d%m%y.%H%M) \ No newline at end of file +git push origin $branch \ No newline at end of file diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 5c8e43b4..45fe3a48 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -38,13 +38,62 @@ No other software is needed as everything it's already included!

NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.

+

INSTALLATION INSTRUCTIONS:

+ +

For a better experience is suggested to use the official Steam Controller Config available under community configs in Steam

GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b + +

+ Yuzu: +

    +
  • Disabled shader caching as it was broken
    • +
  • Switched from vulkan to opengl as vulkan is experimental and it's not working correctly for the games majority, you can set vulkan by opening tuzu from Tools -> Start Yuzu
    • +
  • Edited Hotkeys (see wiki)
    • +
  • Increased performances
    • +
  • Fixed graphics and scaling
    • +
  • Fixed right control stick
    • +
+ + PCSX2: +
    +
  • Symlinked bios/pcsx folder in /bios to solve issue#63
    • +
+ + Backend: +
    +
  • Uploaded a test Steam Controller config, you can download it from community controller configs on Steam
    • +
  • Unhidden .themes and .downloaded_media folders
    • +
  • Moved the lockfile in the internal folders
    • +
  • General code cleanup.
    • +
+ + Known Issues: +
    +
  • PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved
    • +
  • Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode
    • +
+ +

IMPORTANT NOTE: + At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs. +

+

+ + + - https://github.com/XargonWan/RetroDECK/releases/tag/0.4.2b + https://github.com/XargonWan/RetroDECK/releases/tag/0.4.3b

Emulators:

    diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 29ae7a7d..e10086d5 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,9 +66,9 @@ modules: # The version number is stored in /var/conf/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [X] Update the VERSION variable - # [X] Update the appdata.xml with the version number and notes - # [X] change branch into main in retrodeck module (last one) + # [ ] Update the VERSION variable + # [ ] Update the appdata.xml with the version number and notes + # [ ] change branch into main in retrodeck module (last one) # - name: version-initialization buildsystem: simple @@ -76,7 +76,7 @@ modules: - | git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="0.4.3b" + VERSION="cooker-0.4.4b" if [[ $VERSION == "cooker" ]]; then VERSION=$(git describe --tags | tr - .) @@ -1161,24 +1161,8 @@ modules: # TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit) - # Configuring emulators: - - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs/Dolphin - # RetroArch - - cp emu-configs/retroarch* ${FLATPAK_DEST}/retrodeck/emu-configs/ - # Dolphin - - cp -r emu-configs/Dolphin ${FLATPAK_DEST}/retrodeck/emu-configs/Dolphin - # Yuzu - - cp emu-configs/yuzu-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - # Pcsx2 - - cp emu-configs/PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - - cp emu-configs/GS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - - cp emu-configs/PCSX2_vm.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - # MelonDS - - cp emu-configs/melonDS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - # CITRA - - cp emu-configs/citra-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ - # RPCS3 - - cp emu-configs/config.yml ${FLATPAK_DEST}/retrodeck/emu-configs/ + # Initializing default emulator configs + - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ # Overlays #- cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays Disabled in 0.4.2b as it will be introduced in 0.5.0b @@ -1190,4 +1174,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker-0.4.4b \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index 7089303b..c4e34e89 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,11 +1,17 @@ #!/bin/bash -lockfile="$HOME/retrodeck/.lock" # where the lockfile is located +lockfile="/var/config/retrodeck/.lock" # where the lockfile is located version="$(cat /app/retrodeck/version)" # version info taken from the version file rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodecck emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +# We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions +if [ -f "$HOME/retrodeck/.lock" ] +then + mv "$HOME/retrodeck/.lock" $lockfile +fi + # Functions area dir_prep() { @@ -49,26 +55,6 @@ dir_prep() { echo -e "$symlink is now $real\n" } -cfg_init() { - # Initializing retrodeck config file - #rdconf=/var/config/retrodeck/retrodeck.cfg - - # if I got a config file already I parse it - #if [] - - #else - # touch $rdconf - #fi - - #$roms_folder > /var/config/retrodeck/retrodeck.cfg - return -} - -# is_mounted() { -# # This script checks if the provided path in $1 is mounted -# mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}' -# } - tools_init() { rm -rfv /var/config/retrodeck/tools/ mkdir -pv /var/config/retrodeck/tools/ @@ -98,7 +84,7 @@ standalones_init() { dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered" # configuring Yuzu mkdir -pv /var/config/yuzu/ - cp -fvr $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini + cp -fvr $emuconfigs/yuzu/* /var/config/yuzu/ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots" @@ -107,7 +93,7 @@ standalones_init() { echo "Initializing DOLPHIN" echo "----------------------" mkdir -pv /var/config/dolphin-emu/ - cp -fvr "$emuconfigs/Dolphin/"* /var/config/dolphin-emu/ + cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/ dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves" dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii" @@ -123,6 +109,7 @@ standalones_init() { dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" + dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2/bios" # MelonDS echo "----------------------" @@ -176,11 +163,26 @@ post_update() { # post update script echo "Executing post-update script" - # Doing the dir prep as we don know from which version we came - dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" - dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + # Unhiding downloaded media from the previous versions + if [ -d "$rdhome/.downloaded_media" ] + then + mv -fv "$rdhome/.downloaded_media" "$rdhome/downloaded_media" + fi + + # Unhiding themes folder from the previous versions + if [ -d "$rdhome/.themes" ] + then + mv -fv "$rdhome/.themes" "$rdhome/themes" + fi + + # Doing the dir prep as we don't know from which version we came - Remove in a few versions + dir_prep "$rdhome/downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" + dir_prep "$rdhome/themes" "/var/config/emulationstation/.emulationstation/themes" mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions - cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml #this is resetting es_systems, now we need it but in the future I should think a better solution + + # Resetting es_systems, now we need it but in the future I should think a better solution, maybe with sed + cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml + ra_init standalones_init tools_init @@ -268,8 +270,8 @@ finit() { cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml # ES-DE preparing themes and scraped folders - dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" - dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + dir_prep "$rdhome/downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" + dir_prep "$rdhome/themes" "/var/config/emulationstation/.emulationstation/themes" # PICO-8 dir_prep "$roms_folder/pico8" "$rdhome/bios/pico8/bbs/carts" #this is the folder where pico-8 is saving the carts